mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
allow specifying the channel map to use on the command line
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@805 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
c478b0f118
commit
c3cc14153a
1 changed files with 24 additions and 3 deletions
|
|
@ -66,6 +66,9 @@ static pa_sample_spec sample_spec = {
|
||||||
.channels = 2
|
.channels = 2
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static pa_channel_map channel_map;
|
||||||
|
static int channel_map_set = 0;
|
||||||
|
|
||||||
/* A shortcut for terminating the application */
|
/* A shortcut for terminating the application */
|
||||||
static void quit(int ret) {
|
static void quit(int ret) {
|
||||||
assert(mainloop_api);
|
assert(mainloop_api);
|
||||||
|
|
@ -184,7 +187,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
|
||||||
if (verbose)
|
if (verbose)
|
||||||
fprintf(stderr, "Connection established.\n");
|
fprintf(stderr, "Connection established.\n");
|
||||||
|
|
||||||
if (!(stream = pa_stream_new(c, stream_name, &sample_spec, NULL))) {
|
if (!(stream = pa_stream_new(c, stream_name, &sample_spec, channel_map_set ? &channel_map : NULL))) {
|
||||||
fprintf(stderr, "pa_stream_new() failed: %s\n", pa_strerror(pa_context_errno(c)));
|
fprintf(stderr, "pa_stream_new() failed: %s\n", pa_strerror(pa_context_errno(c)));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
@ -405,7 +408,8 @@ static void help(const char *argv0) {
|
||||||
" --format=SAMPLEFORMAT The sample type, one of s16le, s16be, u8, float32le,\n"
|
" --format=SAMPLEFORMAT The sample type, one of s16le, s16be, u8, float32le,\n"
|
||||||
" float32be, ulaw, alaw (defaults to s16ne)\n"
|
" float32be, ulaw, alaw (defaults to s16ne)\n"
|
||||||
" --channels=CHANNELS The number of channels, 1 for mono, 2 for stereo\n"
|
" --channels=CHANNELS The number of channels, 1 for mono, 2 for stereo\n"
|
||||||
" (defaults to 2)\n",
|
" (defaults to 2)\n"
|
||||||
|
" --channel-map=CHANNELMAP Channel map to use instead of the default\n",
|
||||||
argv0);
|
argv0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -415,7 +419,8 @@ enum {
|
||||||
ARG_VOLUME,
|
ARG_VOLUME,
|
||||||
ARG_SAMPLERATE,
|
ARG_SAMPLERATE,
|
||||||
ARG_SAMPLEFORMAT,
|
ARG_SAMPLEFORMAT,
|
||||||
ARG_CHANNELS
|
ARG_CHANNELS,
|
||||||
|
ARG_CHANNELMAP,
|
||||||
};
|
};
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
|
|
@ -438,6 +443,7 @@ int main(int argc, char *argv[]) {
|
||||||
{"rate", 1, NULL, ARG_SAMPLERATE},
|
{"rate", 1, NULL, ARG_SAMPLERATE},
|
||||||
{"format", 1, NULL, ARG_SAMPLEFORMAT},
|
{"format", 1, NULL, ARG_SAMPLEFORMAT},
|
||||||
{"channels", 1, NULL, ARG_CHANNELS},
|
{"channels", 1, NULL, ARG_CHANNELS},
|
||||||
|
{"channel-map", 1, NULL, ARG_CHANNELMAP},
|
||||||
{NULL, 0, NULL, 0}
|
{NULL, 0, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -514,6 +520,16 @@ int main(int argc, char *argv[]) {
|
||||||
sample_spec.rate = atoi(optarg);
|
sample_spec.rate = atoi(optarg);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ARG_CHANNELMAP:
|
||||||
|
|
||||||
|
if (!pa_channel_map_parse(&channel_map, optarg)) {
|
||||||
|
fprintf(stderr, "Invalid channel map\n");
|
||||||
|
goto quit;
|
||||||
|
}
|
||||||
|
|
||||||
|
channel_map_set = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
goto quit;
|
goto quit;
|
||||||
}
|
}
|
||||||
|
|
@ -530,6 +546,11 @@ int main(int argc, char *argv[]) {
|
||||||
goto quit;
|
goto quit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (channel_map_set && channel_map.channels != sample_spec.channels) {
|
||||||
|
fprintf(stderr, "Channel map doesn't match sample specification\n");
|
||||||
|
goto quit;
|
||||||
|
}
|
||||||
|
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
|
char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
|
||||||
pa_sample_spec_snprint(t, sizeof(t), &sample_spec);
|
pa_sample_spec_snprint(t, sizeof(t), &sample_spec);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue