From 456284918ab04cde6c661839d706cb84baf3a887 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 00:39:36 +0200 Subject: update documentation and help texts for s32le/s32be sample types --- src/utils/pacat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/utils/pacat.c') diff --git a/src/utils/pacat.c b/src/utils/pacat.c index c1826d7b..f42abc8e 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -500,7 +500,7 @@ static void help(const char *argv0) { " --volume=VOLUME Specify the initial (linear) volume in range 0...65536\n" " --rate=SAMPLERATE The sample rate in Hz (defaults to 44100)\n" " --format=SAMPLEFORMAT The sample type, one of s16le, s16be, u8, float32le,\n" - " float32be, ulaw, alaw (defaults to s16ne)\n" + " float32be, ulaw, alaw, s32le, s32be (defaults to s16ne)\n" " --channels=CHANNELS The number of channels, 1 for mono, 2 for stereo\n" " (defaults to 2)\n" " --channel-map=CHANNELMAP Channel map to use instead of the default\n" -- cgit From 3f6f13f90227d1adfe39b56671aa34745778f35d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:31:17 +0200 Subject: use pa_channel_map_compatible() where applicable --- src/utils/pacat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/utils/pacat.c') diff --git a/src/utils/pacat.c b/src/utils/pacat.c index f42abc8e..76aea36a 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -695,7 +695,7 @@ int main(int argc, char *argv[]) { goto quit; } - if (channel_map_set && channel_map.channels != sample_spec.channels) { + if (channel_map_set && pa_channel_map_compatible(&channel_map, &sample_spec)) { fprintf(stderr, _("Channel map doesn't match sample specification\n")); goto quit; } -- cgit From a609e4a700da10926fcb9c9633dee1342907de97 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:31:39 +0200 Subject: check for errors returned by pa_context_connect() --- src/utils/pacat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/utils/pacat.c') diff --git a/src/utils/pacat.c b/src/utils/pacat.c index 76aea36a..99df5b9e 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -773,7 +773,10 @@ int main(int argc, char *argv[]) { pa_context_set_state_callback(context, context_state_callback, NULL); /* Connect the context */ - pa_context_connect(context, server, 0, NULL); + if (pa_context_connect(context, server, 0, NULL) < 0) { + fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context))); + goto quit; + } if (verbose) { struct timeval tv; -- cgit