X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/32927c50a8fef49f8a24eee82bf4ca64253a3dfc..930159d4c5feeda3c6abad02e4c74dea366f9c39:/src/utils/pactl.c diff --git a/src/utils/pactl.c b/src/utils/pactl.c index a9d4c824..1eac826b 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -30,15 +30,16 @@ #include #include #include -#include #include #include +#include #include -#include #include +#include +#include #include #include #include @@ -56,17 +57,19 @@ static char *module_args = NULL, *card_name = NULL, *profile_name = NULL, - *port_name = NULL; + *port_name = NULL, + *formats = NULL; static uint32_t sink_input_idx = PA_INVALID_INDEX, - source_output_idx = PA_INVALID_INDEX; + source_output_idx = PA_INVALID_INDEX, + sink_idx = PA_INVALID_INDEX; -static pa_bool_t short_list_format = FALSE; +static bool short_list_format = false; static uint32_t module_index; -static pa_bool_t suspend; -static pa_bool_t mute; -static pa_volume_t volume; +static int32_t latency_offset; +static bool suspend; +static pa_cvolume volume; static enum volume_flags { VOL_UINT = 0, VOL_PERCENT = 1, @@ -76,6 +79,13 @@ static enum volume_flags { VOL_RELATIVE = 1 << 4, } volume_flags; +static enum mute_flags { + INVALID_MUTE = -1, + UNMUTE = 0, + MUTE = 1, + TOGGLE_MUTE = 2 +} mute = INVALID_MUTE; + static pa_proplist *proplist = NULL; static SNDFILE *sndfile = NULL; @@ -83,9 +93,14 @@ static pa_stream *sample_stream = NULL; static pa_sample_spec sample_spec; static pa_channel_map channel_map; static size_t sample_length = 0; -static int actions = 1; -static pa_bool_t nl = FALSE; +/* This variable tracks the number of ongoing asynchronous operations. When a + * new operation begins, this is incremented simply with actions++, and when + * an operation finishes, this is decremented with the complete_action() + * function, which shuts down the program if actions reaches zero. */ +static int actions = 0; + +static bool nl = false; static enum { NONE, @@ -104,7 +119,9 @@ static enum { SUSPEND_SOURCE, SET_CARD_PROFILE, SET_SINK_PORT, + SET_DEFAULT_SINK, SET_SOURCE_PORT, + SET_DEFAULT_SOURCE, SET_SINK_VOLUME, SET_SOURCE_VOLUME, SET_SINK_INPUT_VOLUME, @@ -112,6 +129,9 @@ static enum { SET_SINK_MUTE, SET_SOURCE_MUTE, SET_SINK_INPUT_MUTE, + SET_SOURCE_OUTPUT_MUTE, + SET_SINK_FORMATS, + SET_PORT_LATENCY_OFFSET, SUBSCRIBE } action = NONE; @@ -208,6 +228,14 @@ static void get_server_info_callback(pa_context *c, const pa_server_info *i, voi complete_action(); } +static const char* get_available_str_ynonly(int available) { + switch (available) { + case PA_PORT_AVAILABLE_YES: return ", available"; + case PA_PORT_AVAILABLE_NO: return ", not available"; + } + return ""; +} + static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_last, void *userdata) { static const char *state_table[] = { @@ -219,10 +247,8 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_ char s[PA_SAMPLE_SPEC_SNPRINT_MAX], - cv[PA_CVOLUME_SNPRINT_MAX], - cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX], - v[PA_VOLUME_SNPRINT_MAX], - vdb[PA_SW_VOLUME_SNPRINT_DB_MAX], + cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX], + v[PA_VOLUME_SNPRINT_VERBOSE_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], f[PA_FORMAT_INFO_SNPRINT_MAX]; char *pl; @@ -242,7 +268,7 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_ if (nl && !short_list_format) printf("\n"); - nl = TRUE; + nl = true; if (short_list_format) { printf("%u\t%s\t%s\t%s\t%s\n", @@ -263,12 +289,12 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_ "\tChannel Map: %s\n" "\tOwner Module: %u\n" "\tMute: %s\n" - "\tVolume: %s%s%s\n" + "\tVolume: %s\n" "\t balance %0.2f\n" - "\tBase Volume: %s%s%s\n" + "\tBase Volume: %s\n" "\tMonitor Source: %s\n" "\tLatency: %0.0f usec, configured %0.0f usec\n" - "\tFlags: %s%s%s%s%s%s\n" + "\tFlags: %s%s%s%s%s%s%s\n" "\tProperties:\n\t\t%s\n"), i->index, state_table[1+i->state], @@ -279,13 +305,9 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_ pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map), i->owner_module, pa_yes_no(i->mute), - pa_cvolume_snprint(cv, sizeof(cv), &i->volume), - i->flags & PA_SINK_DECIBEL_VOLUME ? "\n\t " : "", - i->flags & PA_SINK_DECIBEL_VOLUME ? pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume) : "", + pa_cvolume_snprint_verbose(cv, sizeof(cv), &i->volume, &i->channel_map, i->flags & PA_SINK_DECIBEL_VOLUME), pa_cvolume_get_balance(&i->volume, &i->channel_map), - pa_volume_snprint(v, sizeof(v), i->base_volume), - i->flags & PA_SINK_DECIBEL_VOLUME ? "\n\t " : "", - i->flags & PA_SINK_DECIBEL_VOLUME ? pa_sw_volume_snprint_dB(vdb, sizeof(vdb), i->base_volume) : "", + pa_volume_snprint_verbose(v, sizeof(v), i->base_volume, i->flags & PA_SINK_DECIBEL_VOLUME), pa_strnull(i->monitor_source_name), (double) i->latency, (double) i->configured_latency, i->flags & PA_SINK_HARDWARE ? "HARDWARE " : "", @@ -294,6 +316,7 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_ i->flags & PA_SINK_HW_VOLUME_CTRL ? "HW_VOLUME_CTRL " : "", i->flags & PA_SINK_DECIBEL_VOLUME ? "DECIBEL_VOLUME " : "", i->flags & PA_SINK_LATENCY ? "LATENCY " : "", + i->flags & PA_SINK_SET_FORMATS ? "SET_FORMATS " : "", pl = pa_proplist_to_string_sep(i->proplist, "\n\t\t")); pa_xfree(pl); @@ -303,7 +326,8 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_ printf(_("\tPorts:\n")); for (p = i->ports; *p; p++) - printf("\t\t%s: %s (priority. %u)\n", (*p)->name, (*p)->description, (*p)->priority); + printf("\t\t%s: %s (priority: %u%s)\n", (*p)->name, (*p)->description, + (*p)->priority, get_available_str_ynonly((*p)->available)); } if (i->active_port) @@ -330,10 +354,8 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int char s[PA_SAMPLE_SPEC_SNPRINT_MAX], - cv[PA_CVOLUME_SNPRINT_MAX], - cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX], - v[PA_VOLUME_SNPRINT_MAX], - vdb[PA_SW_VOLUME_SNPRINT_DB_MAX], + cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX], + v[PA_VOLUME_SNPRINT_VERBOSE_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], f[PA_FORMAT_INFO_SNPRINT_MAX]; char *pl; @@ -353,7 +375,7 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int if (nl && !short_list_format) printf("\n"); - nl = TRUE; + nl = true; if (short_list_format) { printf("%u\t%s\t%s\t%s\t%s\n", @@ -374,9 +396,9 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int "\tChannel Map: %s\n" "\tOwner Module: %u\n" "\tMute: %s\n" - "\tVolume: %s%s%s\n" + "\tVolume: %s\n" "\t balance %0.2f\n" - "\tBase Volume: %s%s%s\n" + "\tBase Volume: %s\n" "\tMonitor of Sink: %s\n" "\tLatency: %0.0f usec, configured %0.0f usec\n" "\tFlags: %s%s%s%s%s%s\n" @@ -390,13 +412,9 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map), i->owner_module, pa_yes_no(i->mute), - pa_cvolume_snprint(cv, sizeof(cv), &i->volume), - i->flags & PA_SOURCE_DECIBEL_VOLUME ? "\n\t " : "", - i->flags & PA_SOURCE_DECIBEL_VOLUME ? pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume) : "", + pa_cvolume_snprint_verbose(cv, sizeof(cv), &i->volume, &i->channel_map, i->flags & PA_SOURCE_DECIBEL_VOLUME), pa_cvolume_get_balance(&i->volume, &i->channel_map), - pa_volume_snprint(v, sizeof(v), i->base_volume), - i->flags & PA_SOURCE_DECIBEL_VOLUME ? "\n\t " : "", - i->flags & PA_SOURCE_DECIBEL_VOLUME ? pa_sw_volume_snprint_dB(vdb, sizeof(vdb), i->base_volume) : "", + pa_volume_snprint_verbose(v, sizeof(v), i->base_volume, i->flags & PA_SOURCE_DECIBEL_VOLUME), i->monitor_of_sink_name ? i->monitor_of_sink_name : _("n/a"), (double) i->latency, (double) i->configured_latency, i->flags & PA_SOURCE_HARDWARE ? "HARDWARE " : "", @@ -414,7 +432,8 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int printf(_("\tPorts:\n")); for (p = i->ports; *p; p++) - printf("\t\t%s: %s (priority. %u)\n", (*p)->name, (*p)->description, (*p)->priority); + printf("\t\t%s: %s (priority: %u%s)\n", (*p)->name, (*p)->description, + (*p)->priority, get_available_str_ynonly((*p)->available)); } if (i->active_port) @@ -449,7 +468,7 @@ static void get_module_info_callback(pa_context *c, const pa_module_info *i, int if (nl && !short_list_format) printf("\n"); - nl = TRUE; + nl = true; pa_snprintf(t, sizeof(t), "%u", i->n_used); @@ -491,7 +510,7 @@ static void get_client_info_callback(pa_context *c, const pa_client_info *i, int if (nl && !short_list_format) printf("\n"); - nl = TRUE; + nl = true; pa_snprintf(t, sizeof(t), "%u", i->owner_module); @@ -534,7 +553,7 @@ static void get_card_info_callback(pa_context *c, const pa_card_info *i, int is_ if (nl && !short_list_format) printf("\n"); - nl = TRUE; + nl = true; pa_snprintf(t, sizeof(t), "%u", i->owner_module); @@ -554,23 +573,51 @@ static void get_card_info_callback(pa_context *c, const pa_card_info *i, int is_ i->owner_module != PA_INVALID_INDEX ? t : _("n/a"), pl = pa_proplist_to_string_sep(i->proplist, "\n\t\t")); - if (i->profiles) { - pa_card_profile_info *p; + pa_xfree(pl); + + if (i->n_profiles > 0) { + pa_card_profile_info2 **p; printf(_("\tProfiles:\n")); - for (p = i->profiles; p->name; p++) - printf("\t\t%s: %s (sinks: %u, sources: %u, priority. %u)\n", p->name, p->description, p->n_sinks, p->n_sources, p->priority); + for (p = i->profiles2; *p; p++) + printf("\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n", (*p)->name, + (*p)->description, (*p)->n_sinks, (*p)->n_sources, (*p)->priority, pa_yes_no((*p)->available)); } if (i->active_profile) printf(_("\tActive Profile: %s\n"), i->active_profile->name); - pa_xfree(pl); + if (i->ports) { + pa_card_port_info **p; + + printf(_("\tPorts:\n")); + for (p = i->ports; *p; p++) { + pa_card_profile_info **pr = (*p)->profiles; + printf("\t\t%s: %s (priority: %u, latency offset: %" PRId64 " usec%s)\n", (*p)->name, + (*p)->description, (*p)->priority, (*p)->latency_offset, + get_available_str_ynonly((*p)->available)); + + if (!pa_proplist_isempty((*p)->proplist)) { + printf(_("\t\t\tProperties:\n\t\t\t\t%s\n"), pl = pa_proplist_to_string_sep((*p)->proplist, "\n\t\t\t\t")); + pa_xfree(pl); + } + + if (pr) { + printf(_("\t\t\tPart of profile(s): %s"), pa_strnull((*pr)->name)); + pr++; + while (*pr) { + printf(", %s", pa_strnull((*pr)->name)); + pr++; + } + printf("\n"); + } + } + } } static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info *i, int is_last, void *userdata) { - char t[32], k[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], f[PA_FORMAT_INFO_SNPRINT_MAX]; + char t[32], k[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], f[PA_FORMAT_INFO_SNPRINT_MAX]; char *pl; if (is_last < 0) { @@ -588,7 +635,7 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info if (nl && !short_list_format) printf("\n"); - nl = TRUE; + nl = true; pa_snprintf(t, sizeof(t), "%u", i->owner_module); pa_snprintf(k, sizeof(k), "%u", i->client); @@ -611,9 +658,9 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info "\tSample Specification: %s\n" "\tChannel Map: %s\n" "\tFormat: %s\n" + "\tCorked: %s\n" "\tMute: %s\n" "\tVolume: %s\n" - "\t %s\n" "\t balance %0.2f\n" "\tBuffer Latency: %0.0f usec\n" "\tSink Latency: %0.0f usec\n" @@ -627,9 +674,9 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec), pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map), pa_format_info_snprint(f, sizeof(f), i->format), + pa_yes_no(i->corked), pa_yes_no(i->mute), - pa_cvolume_snprint(cv, sizeof(cv), &i->volume), - pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume), + pa_cvolume_snprint_verbose(cv, sizeof(cv), &i->volume, &i->channel_map, true), pa_cvolume_get_balance(&i->volume, &i->channel_map), (double) i->buffer_usec, (double) i->sink_usec, @@ -640,7 +687,7 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info } static void get_source_output_info_callback(pa_context *c, const pa_source_output_info *i, int is_last, void *userdata) { - char t[32], k[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], f[PA_FORMAT_INFO_SNPRINT_MAX]; + char t[32], k[32], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], f[PA_FORMAT_INFO_SNPRINT_MAX]; char *pl; if (is_last < 0) { @@ -658,8 +705,7 @@ static void get_source_output_info_callback(pa_context *c, const pa_source_outpu if (nl && !short_list_format) printf("\n"); - nl = TRUE; - + nl = true; pa_snprintf(t, sizeof(t), "%u", i->owner_module); pa_snprintf(k, sizeof(k), "%u", i->client); @@ -682,9 +728,9 @@ static void get_source_output_info_callback(pa_context *c, const pa_source_outpu "\tSample Specification: %s\n" "\tChannel Map: %s\n" "\tFormat: %s\n" + "\tCorked: %s\n" "\tMute: %s\n" "\tVolume: %s\n" - "\t %s\n" "\t balance %0.2f\n" "\tBuffer Latency: %0.0f usec\n" "\tSource Latency: %0.0f usec\n" @@ -698,9 +744,9 @@ static void get_source_output_info_callback(pa_context *c, const pa_source_outpu pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec), pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map), pa_format_info_snprint(f, sizeof(f), i->format), + pa_yes_no(i->corked), pa_yes_no(i->mute), - pa_cvolume_snprint(cv, sizeof(cv), &i->volume), - pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume), + pa_cvolume_snprint_verbose(cv, sizeof(cv), &i->volume, &i->channel_map, true), pa_cvolume_get_balance(&i->volume, &i->channel_map), (double) i->buffer_usec, (double) i->source_usec, @@ -711,7 +757,7 @@ static void get_source_output_info_callback(pa_context *c, const pa_source_outpu } static void get_sample_info_callback(pa_context *c, const pa_sample_info *i, int is_last, void *userdata) { - char t[PA_BYTES_SNPRINT_MAX], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX]; + char t[PA_BYTES_SNPRINT_MAX], s[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX]; char *pl; if (is_last < 0) { @@ -729,7 +775,7 @@ static void get_sample_info_callback(pa_context *c, const pa_sample_info *i, int if (nl && !short_list_format) printf("\n"); - nl = TRUE; + nl = true; pa_bytes_snprint(t, sizeof(t), i->bytes); @@ -747,7 +793,6 @@ static void get_sample_info_callback(pa_context *c, const pa_sample_info *i, int "\tSample Specification: %s\n" "\tChannel Map: %s\n" "\tVolume: %s\n" - "\t %s\n" "\t balance %0.2f\n" "\tDuration: %0.1fs\n" "\tSize: %s\n" @@ -758,8 +803,7 @@ static void get_sample_info_callback(pa_context *c, const pa_sample_info *i, int i->name, pa_sample_spec_valid(&i->sample_spec) ? pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec) : _("n/a"), pa_sample_spec_valid(&i->sample_spec) ? pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map) : _("n/a"), - pa_cvolume_snprint(cv, sizeof(cv), &i->volume), - pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume), + pa_cvolume_snprint_verbose(cv, sizeof(cv), &i->volume, &i->channel_map, true), pa_cvolume_get_balance(&i->volume, &i->channel_map), (double) i->duration/1000000.0, t, @@ -798,13 +842,57 @@ static void volume_relative_adjust(pa_cvolume *cv) { /* Relative volume change is additive in case of UINT or PERCENT * and multiplicative for LINEAR or DECIBEL */ if ((volume_flags & 0x0F) == VOL_UINT || (volume_flags & 0x0F) == VOL_PERCENT) { - pa_volume_t v = pa_cvolume_avg(cv); - v = v + volume < PA_VOLUME_NORM ? PA_VOLUME_MUTED : v + volume - PA_VOLUME_NORM; - pa_cvolume_set(cv, 1, v); + unsigned i; + for (i = 0; i < cv->channels; i++) { + if (cv->values[i] + volume.values[i] < PA_VOLUME_NORM) + cv->values[i] = PA_VOLUME_MUTED; + else + cv->values[i] = cv->values[i] + volume.values[i] - PA_VOLUME_NORM; + } } - if ((volume_flags & 0x0F) == VOL_LINEAR || (volume_flags & 0x0F) == VOL_DECIBEL) { - pa_sw_cvolume_multiply_scalar(cv, cv, volume); + if ((volume_flags & 0x0F) == VOL_LINEAR || (volume_flags & 0x0F) == VOL_DECIBEL) + pa_sw_cvolume_multiply(cv, cv, &volume); +} + +static void unload_module_by_name_callback(pa_context *c, const pa_module_info *i, int is_last, void *userdata) { + static bool unloaded = false; + + if (is_last < 0) { + pa_log(_("Failed to get module information: %s"), pa_strerror(pa_context_errno(c))); + quit(1); + return; } + + if (is_last) { + if (unloaded == false) + pa_log(_("Failed to unload module: Module %s not loaded"), module_name); + complete_action(); + return; + } + + pa_assert(i); + + if (pa_streq(module_name, i->name)) { + unloaded = true; + actions++; + pa_operation_unref(pa_context_unload_module(c, i->index, simple_callback, NULL)); + } +} + +static void fill_volume(pa_cvolume *cv, unsigned supported) { + if (volume.channels == 1) { + pa_cvolume_set(&volume, supported, volume.values[0]); + } else if (volume.channels != supported) { + pa_log(_("Failed to set volume: You tried to set volumes for %d channels, whereas channel/s supported = %d\n"), + volume.channels, supported); + quit(1); + return; + } + + if (volume_flags & VOL_RELATIVE) + volume_relative_adjust(cv); + else + *cv = volume; } static void get_sink_volume_callback(pa_context *c, const pa_sink_info *i, int is_last, void *userdata) { @@ -822,7 +910,8 @@ static void get_sink_volume_callback(pa_context *c, const pa_sink_info *i, int i pa_assert(i); cv = i->volume; - volume_relative_adjust(&cv); + fill_volume(&cv, i->channel_map.channels); + pa_operation_unref(pa_context_set_sink_volume_by_name(c, sink_name, &cv, simple_callback, NULL)); } @@ -841,7 +930,8 @@ static void get_source_volume_callback(pa_context *c, const pa_source_info *i, i pa_assert(i); cv = i->volume; - volume_relative_adjust(&cv); + fill_volume(&cv, i->channel_map.channels); + pa_operation_unref(pa_context_set_source_volume_by_name(c, source_name, &cv, simple_callback, NULL)); } @@ -860,7 +950,8 @@ static void get_sink_input_volume_callback(pa_context *c, const pa_sink_input_in pa_assert(i); cv = i->volume; - volume_relative_adjust(&cv); + fill_volume(&cv, i->channel_map.channels); + pa_operation_unref(pa_context_set_sink_input_volume(c, sink_input_idx, &cv, simple_callback, NULL)); } @@ -879,10 +970,114 @@ static void get_source_output_volume_callback(pa_context *c, const pa_source_out pa_assert(o); cv = o->volume; - volume_relative_adjust(&cv); + fill_volume(&cv, o->channel_map.channels); + pa_operation_unref(pa_context_set_source_output_volume(c, source_output_idx, &cv, simple_callback, NULL)); } +static void sink_toggle_mute_callback(pa_context *c, const pa_sink_info *i, int is_last, void *userdata) { + if (is_last < 0) { + pa_log(_("Failed to get sink information: %s"), pa_strerror(pa_context_errno(c))); + quit(1); + return; + } + + if (is_last) + return; + + pa_assert(i); + + pa_operation_unref(pa_context_set_sink_mute_by_name(c, i->name, !i->mute, simple_callback, NULL)); +} + +static void source_toggle_mute_callback(pa_context *c, const pa_source_info *o, int is_last, void *userdata) { + if (is_last < 0) { + pa_log(_("Failed to get source information: %s"), pa_strerror(pa_context_errno(c))); + quit(1); + return; + } + + if (is_last) + return; + + pa_assert(o); + + pa_operation_unref(pa_context_set_source_mute_by_name(c, o->name, !o->mute, simple_callback, NULL)); +} + +static void sink_input_toggle_mute_callback(pa_context *c, const pa_sink_input_info *i, int is_last, void *userdata) { + if (is_last < 0) { + pa_log(_("Failed to get sink input information: %s"), pa_strerror(pa_context_errno(c))); + quit(1); + return; + } + + if (is_last) + return; + + pa_assert(i); + + pa_operation_unref(pa_context_set_sink_input_mute(c, i->index, !i->mute, simple_callback, NULL)); +} + +static void source_output_toggle_mute_callback(pa_context *c, const pa_source_output_info *o, int is_last, void *userdata) { + if (is_last < 0) { + pa_log(_("Failed to get source output information: %s"), pa_strerror(pa_context_errno(c))); + quit(1); + return; + } + + if (is_last) + return; + + pa_assert(o); + + pa_operation_unref(pa_context_set_source_output_mute(c, o->index, !o->mute, simple_callback, NULL)); +} + +/* PA_MAX_FORMATS is defined in internal.h so we just define a sane value here */ +#define MAX_FORMATS 256 + +static void set_sink_formats(pa_context *c, uint32_t sink, const char *str) { + pa_format_info *f_arr[MAX_FORMATS]; + char *format = NULL; + const char *state = NULL; + int i = 0; + pa_operation *o = NULL; + + while ((format = pa_split(str, ";", &state))) { + pa_format_info *f = pa_format_info_from_string(pa_strip(format)); + + if (!f) { + pa_log(_("Failed to set format: invalid format string %s"), format); + goto error; + } + + f_arr[i++] = f; + pa_xfree(format); + } + + o = pa_ext_device_restore_save_formats(c, PA_DEVICE_TYPE_SINK, sink, i, f_arr, simple_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + +done: + if (format) + pa_xfree(format); + while(i--) + pa_format_info_free(f_arr[i]); + + return; + +error: + while(i--) + pa_format_info_free(f_arr[i]); + quit(1); + goto done; +} + static void stream_state_callback(pa_stream *s, void *userdata) { pa_assert(s); @@ -975,7 +1170,7 @@ static const char *subscription_event_facility_to_string(pa_subscription_event_t return _("server"); case PA_SUBSCRIPTION_EVENT_CARD: - return _("server"); + return _("card"); } return _("unknown"); @@ -988,10 +1183,14 @@ static void context_subscribe_callback(pa_context *c, pa_subscription_event_type subscription_event_type_to_string(t), subscription_event_facility_to_string(t), idx); + fflush(stdout); } static void context_state_callback(pa_context *c, void *userdata) { + pa_operation *o = NULL; + pa_assert(c); + switch (pa_context_get_state(c)) { case PA_CONTEXT_CONNECTING: case PA_CONTEXT_AUTHORIZING: @@ -1001,19 +1200,26 @@ static void context_state_callback(pa_context *c, void *userdata) { case PA_CONTEXT_READY: switch (action) { case STAT: - pa_operation_unref(pa_context_stat(c, stat_callback, NULL)); - break; + o = pa_context_stat(c, stat_callback, NULL); + if (short_list_format) + break; + + if (o) { + pa_operation_unref(o); + actions++; + } + /* Fall through */ case INFO: - pa_operation_unref(pa_context_get_server_info(c, get_server_info_callback, NULL)); + o = pa_context_get_server_info(c, get_server_info_callback, NULL); break; case PLAY_SAMPLE: - pa_operation_unref(pa_context_play_sample(c, sample_name, sink_name, PA_VOLUME_NORM, simple_callback, NULL)); + o = pa_context_play_sample(c, sample_name, sink_name, PA_VOLUME_NORM, simple_callback, NULL); break; case REMOVE_SAMPLE: - pa_operation_unref(pa_context_remove_sample(c, sample_name, simple_callback, NULL)); + o = pa_context_remove_sample(c, sample_name, simple_callback, NULL); break; case UPLOAD_SAMPLE: @@ -1023,160 +1229,221 @@ static void context_state_callback(pa_context *c, void *userdata) { pa_stream_set_state_callback(sample_stream, stream_state_callback, NULL); pa_stream_set_write_callback(sample_stream, stream_write_callback, NULL); pa_stream_connect_upload(sample_stream, sample_length); + actions++; break; case EXIT: - pa_operation_unref(pa_context_exit_daemon(c, simple_callback, NULL)); + o = pa_context_exit_daemon(c, simple_callback, NULL); break; case LIST: if (list_type) { if (pa_streq(list_type, "modules")) - pa_operation_unref(pa_context_get_module_info_list(c, get_module_info_callback, NULL)); + o = pa_context_get_module_info_list(c, get_module_info_callback, NULL); else if (pa_streq(list_type, "sinks")) - pa_operation_unref(pa_context_get_sink_info_list(c, get_sink_info_callback, NULL)); + o = pa_context_get_sink_info_list(c, get_sink_info_callback, NULL); else if (pa_streq(list_type, "sources")) - pa_operation_unref(pa_context_get_source_info_list(c, get_source_info_callback, NULL)); + o = pa_context_get_source_info_list(c, get_source_info_callback, NULL); else if (pa_streq(list_type, "sink-inputs")) - pa_operation_unref(pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL)); + o = pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL); else if (pa_streq(list_type, "source-outputs")) - pa_operation_unref(pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL)); + o = pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL); else if (pa_streq(list_type, "clients")) - pa_operation_unref(pa_context_get_client_info_list(c, get_client_info_callback, NULL)); + o = pa_context_get_client_info_list(c, get_client_info_callback, NULL); else if (pa_streq(list_type, "samples")) - pa_operation_unref(pa_context_get_sample_info_list(c, get_sample_info_callback, NULL)); + o = pa_context_get_sample_info_list(c, get_sample_info_callback, NULL); else if (pa_streq(list_type, "cards")) - pa_operation_unref(pa_context_get_card_info_list(c, get_card_info_callback, NULL)); + o = pa_context_get_card_info_list(c, get_card_info_callback, NULL); else pa_assert_not_reached(); } else { - actions = 8; - pa_operation_unref(pa_context_get_module_info_list(c, get_module_info_callback, NULL)); - pa_operation_unref(pa_context_get_sink_info_list(c, get_sink_info_callback, NULL)); - pa_operation_unref(pa_context_get_source_info_list(c, get_source_info_callback, NULL)); - pa_operation_unref(pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL)); - pa_operation_unref(pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL)); - pa_operation_unref(pa_context_get_client_info_list(c, get_client_info_callback, NULL)); - pa_operation_unref(pa_context_get_sample_info_list(c, get_sample_info_callback, NULL)); - pa_operation_unref(pa_context_get_card_info_list(c, get_card_info_callback, NULL)); + o = pa_context_get_module_info_list(c, get_module_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + + o = pa_context_get_sink_info_list(c, get_sink_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + + o = pa_context_get_source_info_list(c, get_source_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + o = pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + + o = pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + + o = pa_context_get_client_info_list(c, get_client_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + + o = pa_context_get_sample_info_list(c, get_sample_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + + o = pa_context_get_card_info_list(c, get_card_info_callback, NULL); + if (o) { + pa_operation_unref(o); + actions++; + } + + o = NULL; } break; case MOVE_SINK_INPUT: - pa_operation_unref(pa_context_move_sink_input_by_name(c, sink_input_idx, sink_name, simple_callback, NULL)); + o = pa_context_move_sink_input_by_name(c, sink_input_idx, sink_name, simple_callback, NULL); break; case MOVE_SOURCE_OUTPUT: - pa_operation_unref(pa_context_move_source_output_by_name(c, source_output_idx, source_name, simple_callback, NULL)); + o = pa_context_move_source_output_by_name(c, source_output_idx, source_name, simple_callback, NULL); break; case LOAD_MODULE: - pa_operation_unref(pa_context_load_module(c, module_name, module_args, index_callback, NULL)); + o = pa_context_load_module(c, module_name, module_args, index_callback, NULL); break; case UNLOAD_MODULE: - pa_operation_unref(pa_context_unload_module(c, module_index, simple_callback, NULL)); + if (module_name) + o = pa_context_get_module_info_list(c, unload_module_by_name_callback, NULL); + else + o = pa_context_unload_module(c, module_index, simple_callback, NULL); break; case SUSPEND_SINK: if (sink_name) - pa_operation_unref(pa_context_suspend_sink_by_name(c, sink_name, suspend, simple_callback, NULL)); + o = pa_context_suspend_sink_by_name(c, sink_name, suspend, simple_callback, NULL); else - pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL)); + o = pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL); break; case SUSPEND_SOURCE: if (source_name) - pa_operation_unref(pa_context_suspend_source_by_name(c, source_name, suspend, simple_callback, NULL)); + o = pa_context_suspend_source_by_name(c, source_name, suspend, simple_callback, NULL); else - pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL)); + o = pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL); break; case SET_CARD_PROFILE: - pa_operation_unref(pa_context_set_card_profile_by_name(c, card_name, profile_name, simple_callback, NULL)); + o = pa_context_set_card_profile_by_name(c, card_name, profile_name, simple_callback, NULL); break; case SET_SINK_PORT: - pa_operation_unref(pa_context_set_sink_port_by_name(c, sink_name, port_name, simple_callback, NULL)); + o = pa_context_set_sink_port_by_name(c, sink_name, port_name, simple_callback, NULL); + break; + + case SET_DEFAULT_SINK: + o = pa_context_set_default_sink(c, sink_name, simple_callback, NULL); break; case SET_SOURCE_PORT: - pa_operation_unref(pa_context_set_source_port_by_name(c, source_name, port_name, simple_callback, NULL)); + o = pa_context_set_source_port_by_name(c, source_name, port_name, simple_callback, NULL); + break; + + case SET_DEFAULT_SOURCE: + o = pa_context_set_default_source(c, source_name, simple_callback, NULL); break; case SET_SINK_MUTE: - pa_operation_unref(pa_context_set_sink_mute_by_name(c, sink_name, mute, simple_callback, NULL)); + if (mute == TOGGLE_MUTE) + o = pa_context_get_sink_info_by_name(c, sink_name, sink_toggle_mute_callback, NULL); + else + o = pa_context_set_sink_mute_by_name(c, sink_name, mute, simple_callback, NULL); break; case SET_SOURCE_MUTE: - pa_operation_unref(pa_context_set_source_mute_by_name(c, source_name, mute, simple_callback, NULL)); + if (mute == TOGGLE_MUTE) + o = pa_context_get_source_info_by_name(c, source_name, source_toggle_mute_callback, NULL); + else + o = pa_context_set_source_mute_by_name(c, source_name, mute, simple_callback, NULL); break; case SET_SINK_INPUT_MUTE: - pa_operation_unref(pa_context_set_sink_input_mute(c, sink_input_idx, mute, simple_callback, NULL)); + if (mute == TOGGLE_MUTE) + o = pa_context_get_sink_input_info(c, sink_input_idx, sink_input_toggle_mute_callback, NULL); + else + o = pa_context_set_sink_input_mute(c, sink_input_idx, mute, simple_callback, NULL); + break; + + case SET_SOURCE_OUTPUT_MUTE: + if (mute == TOGGLE_MUTE) + o = pa_context_get_source_output_info(c, source_output_idx, source_output_toggle_mute_callback, NULL); + else + o = pa_context_set_source_output_mute(c, source_output_idx, mute, simple_callback, NULL); break; case SET_SINK_VOLUME: - if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) { - pa_operation_unref(pa_context_get_sink_info_by_name(c, sink_name, get_sink_volume_callback, NULL)); - } else { - pa_cvolume v; - pa_cvolume_set(&v, 1, volume); - pa_operation_unref(pa_context_set_sink_volume_by_name(c, sink_name, &v, simple_callback, NULL)); - } + o = pa_context_get_sink_info_by_name(c, sink_name, get_sink_volume_callback, NULL); break; case SET_SOURCE_VOLUME: - if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) { - pa_operation_unref(pa_context_get_source_info_by_name(c, source_name, get_source_volume_callback, NULL)); - } else { - pa_cvolume v; - pa_cvolume_set(&v, 1, volume); - pa_operation_unref(pa_context_set_source_volume_by_name(c, source_name, &v, simple_callback, NULL)); - } + o = pa_context_get_source_info_by_name(c, source_name, get_source_volume_callback, NULL); break; case SET_SINK_INPUT_VOLUME: - if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) { - pa_operation_unref(pa_context_get_sink_input_info(c, sink_input_idx, get_sink_input_volume_callback, NULL)); - } else { - pa_cvolume v; - pa_cvolume_set(&v, 1, volume); - pa_operation_unref(pa_context_set_sink_input_volume(c, sink_input_idx, &v, simple_callback, NULL)); - } + o = pa_context_get_sink_input_info(c, sink_input_idx, get_sink_input_volume_callback, NULL); break; case SET_SOURCE_OUTPUT_VOLUME: - if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) { - pa_operation_unref(pa_context_get_source_output_info(c, source_output_idx, get_source_output_volume_callback, NULL)); - } else { - pa_cvolume v; - pa_cvolume_set(&v, 1, volume); - pa_operation_unref(pa_context_set_source_output_volume(c, source_output_idx, &v, simple_callback, NULL)); - } + o = pa_context_get_source_output_info(c, source_output_idx, get_source_output_volume_callback, NULL); + break; + + case SET_SINK_FORMATS: + set_sink_formats(c, sink_idx, formats); + break; + + case SET_PORT_LATENCY_OFFSET: + o = pa_context_set_port_latency_offset(c, card_name, port_name, latency_offset, simple_callback, NULL); break; case SUBSCRIBE: pa_context_set_subscribe_callback(c, context_subscribe_callback, NULL); - pa_operation_unref(pa_context_subscribe( - c, - PA_SUBSCRIPTION_MASK_SINK| - PA_SUBSCRIPTION_MASK_SOURCE| - PA_SUBSCRIPTION_MASK_SINK_INPUT| - PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT| - PA_SUBSCRIPTION_MASK_MODULE| - PA_SUBSCRIPTION_MASK_CLIENT| - PA_SUBSCRIPTION_MASK_SAMPLE_CACHE| - PA_SUBSCRIPTION_MASK_SERVER| - PA_SUBSCRIPTION_MASK_CARD, - NULL, - NULL)); + o = pa_context_subscribe(c, + PA_SUBSCRIPTION_MASK_SINK| + PA_SUBSCRIPTION_MASK_SOURCE| + PA_SUBSCRIPTION_MASK_SINK_INPUT| + PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT| + PA_SUBSCRIPTION_MASK_MODULE| + PA_SUBSCRIPTION_MASK_CLIENT| + PA_SUBSCRIPTION_MASK_SAMPLE_CACHE| + PA_SUBSCRIPTION_MASK_SERVER| + PA_SUBSCRIPTION_MASK_CARD, + NULL, + NULL); break; default: pa_assert_not_reached(); } + + if (o) { + pa_operation_unref(o); + actions++; + } + + if (actions == 0) { + pa_log("Operation failed: %s", pa_strerror(pa_context_errno(c))); + quit(1); + } + break; case PA_CONTEXT_TERMINATED: @@ -1250,41 +1517,81 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag return 0; } +static int parse_volumes(char *args[], unsigned n) { + unsigned i; + + if (n >= PA_CHANNELS_MAX) { + pa_log(_("Invalid number of volume specifications.\n")); + return -1; + } + + volume.channels = n; + for (i = 0; i < volume.channels; i++) { + enum volume_flags flags; + + if (parse_volume(args[i], &volume.values[i], &flags) < 0) + return -1; + + if (i > 0 && flags != volume_flags) { + pa_log(_("Inconsistent volume specification.\n")); + return -1; + } else + volume_flags = flags; + } + + return 0; +} + +static enum mute_flags parse_mute(const char *mute_text) { + int b; + + pa_assert(mute_text); + + if (pa_streq("toggle", mute_text)) + return TOGGLE_MUTE; + + b = pa_parse_boolean(mute_text); + switch (b) { + case 0: + return UNMUTE; + case 1: + return MUTE; + default: + return INVALID_MUTE; + } +} + static void help(const char *argv0) { - printf(_("%s [options] stat\n" - "%s [options] info\n" - "%s [options] list [short] [TYPE]\n" - "%s [options] exit\n" - "%s [options] upload-sample FILENAME [NAME]\n" - "%s [options] play-sample NAME [SINK]\n" - "%s [options] remove-sample NAME\n" - "%s [options] move-sink-input SINKINPUT SINK\n" - "%s [options] move-source-output SOURCEOUTPUT SOURCE\n" - "%s [options] load-module NAME [ARGS ...]\n" - "%s [options] unload-module MODULE\n" - "%s [options] suspend-sink SINK 1|0\n" - "%s [options] suspend-source SOURCE 1|0\n" - "%s [options] set-card-profile CARD PROFILE\n" - "%s [options] set-sink-port SINK PORT\n" - "%s [options] set-source-port SOURCE PORT\n" - "%s [options] set-sink-volume SINK VOLUME\n" - "%s [options] set-source-volume SOURCE VOLUME\n" - "%s [options] set-sink-input-volume SINKINPUT VOLUME\n" - "%s [options] set-source-output-volume SOURCEOUTPUT VOLUME\n" - "%s [options] set-sink-mute SINK 1|0\n" - "%s [options] set-source-mute SOURCE 1|0\n" - "%s [options] set-sink-input-mute SINKINPUT 1|0\n" - "%s [options] subscribe\n\n" + printf("%s %s %s\n", argv0, _("[options]"), "stat [short]"); + printf("%s %s %s\n", argv0, _("[options]"), "info"); + printf("%s %s %s %s\n", argv0, _("[options]"), "list [short]", _("[TYPE]")); + printf("%s %s %s\n", argv0, _("[options]"), "exit"); + printf("%s %s %s %s\n", argv0, _("[options]"), "upload-sample", _("FILENAME [NAME]")); + printf("%s %s %s %s\n", argv0, _("[options]"), "play-sample ", _("NAME [SINK]")); + printf("%s %s %s %s\n", argv0, _("[options]"), "remove-sample ", _("NAME")); + printf("%s %s %s %s\n", argv0, _("[options]"), "load-module ", _("NAME [ARGS ...]")); + printf("%s %s %s %s\n", argv0, _("[options]"), "unload-module ", _("NAME|#N")); + printf("%s %s %s %s\n", argv0, _("[options]"), "move-(sink-input|source-output)", _("#N SINK|SOURCE")); + printf("%s %s %s %s\n", argv0, _("[options]"), "suspend-(sink|source)", _("NAME|#N 1|0")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-card-profile ", _("CARD PROFILE")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-default-(sink|source)", _("NAME")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink|source)-port", _("NAME|#N PORT")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink|source)-volume", _("NAME|#N VOLUME")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink-input|source-output)-volume", _("#N VOLUME")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink|source)-mute", _("NAME|#N 1|0|toggle")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink-input|source-output)-mute", _("#N 1|0|toggle")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-sink-formats", _("#N FORMATS")); + printf("%s %s %s %s\n", argv0, _("[options]"), "set-port-latency-offset", _("CARD-NAME|CARD-#N PORT OFFSET")); + printf("%s %s %s\n", argv0, _("[options]"), "subscribe"); + printf(_("\nThe special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@\n" + "can be used to specify the default sink, source and monitor.\n")); + + printf(_("\n" " -h, --help Show this help\n" " --version Show version\n\n" " -s, --server=SERVER The name of the server to connect to\n" - " -n, --client-name=NAME How to call this client on the server\n"), - argv0, argv0, argv0, argv0, argv0, - argv0, argv0, argv0, argv0, argv0, - argv0, argv0, argv0, argv0, argv0, - argv0, argv0, argv0, argv0, argv0, - argv0, argv0, argv0, argv0); + " -n, --client-name=NAME How to call this client on the server\n")); } enum { @@ -1305,13 +1612,15 @@ int main(int argc, char *argv[]) { }; setlocale(LC_ALL, ""); +#ifdef ENABLE_NLS bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); +#endif bn = pa_path_get_filename(argv[0]); proplist = pa_proplist_new(); - while ((c = getopt_long(argc, argv, "s:n:h", long_options, NULL)) != -1) { + while ((c = getopt_long(argc, argv, "+s:n:h", long_options, NULL)) != -1) { switch (c) { case 'h' : help(bn); @@ -1354,10 +1663,13 @@ int main(int argc, char *argv[]) { } if (optind < argc) { - if (pa_streq(argv[optind], "stat")) + if (pa_streq(argv[optind], "stat")) { action = STAT; + short_list_format = false; + if (optind+1 < argc && pa_streq(argv[optind+1], "short")) + short_list_format = true; - else if (pa_streq(argv[optind], "info")) + } else if (pa_streq(argv[optind], "info")) action = INFO; else if (pa_streq(argv[optind], "exit")) @@ -1366,14 +1678,14 @@ int main(int argc, char *argv[]) { else if (pa_streq(argv[optind], "list")) { action = LIST; - for (int i = optind+1; i < argc; i++){ + for (int i = optind+1; i < argc; i++) { if (pa_streq(argv[i], "modules") || pa_streq(argv[i], "clients") || pa_streq(argv[i], "sinks") || pa_streq(argv[i], "sink-inputs") || pa_streq(argv[i], "sources") || pa_streq(argv[i], "source-outputs") || pa_streq(argv[i], "samples") || pa_streq(argv[i], "cards")) { list_type = pa_xstrdup(argv[i]); } else if (pa_streq(argv[i], "short")) { - short_list_format = TRUE; + short_list_format = true; } else { pa_log(_("Specify nothing, or one of: %s"), "modules, sinks, sources, sink-inputs, source-outputs, clients, samples, cards"); goto quit; @@ -1486,13 +1798,16 @@ int main(int argc, char *argv[]) { action = UNLOAD_MODULE; if (argc != optind+2) { - pa_log(_("You have to specify a module index")); + pa_log(_("You have to specify a module index or name")); goto quit; } - module_index = (uint32_t) atoi(argv[optind+1]); + if (pa_atou(argv[optind + 1], &module_index) < 0) + module_name = argv[optind + 1]; } else if (pa_streq(argv[optind], "suspend-sink")) { + int b; + action = SUSPEND_SINK; if (argc > optind+3 || optind+1 >= argc) { @@ -1500,12 +1815,19 @@ int main(int argc, char *argv[]) { goto quit; } - suspend = pa_parse_boolean(argv[argc-1]); + if ((b = pa_parse_boolean(argv[argc-1])) < 0) { + pa_log(_("Invalid suspend specification.")); + goto quit; + } + + suspend = !!b; if (argc > optind+2) sink_name = pa_xstrdup(argv[optind+1]); } else if (pa_streq(argv[optind], "suspend-source")) { + int b; + action = SUSPEND_SOURCE; if (argc > optind+3 || optind+1 >= argc) { @@ -1513,7 +1835,12 @@ int main(int argc, char *argv[]) { goto quit; } - suspend = pa_parse_boolean(argv[argc-1]); + if ((b = pa_parse_boolean(argv[argc-1])) < 0) { + pa_log(_("Invalid suspend specification.")); + goto quit; + } + + suspend = !!b; if (argc > optind+2) source_name = pa_xstrdup(argv[optind+1]); @@ -1539,6 +1866,16 @@ int main(int argc, char *argv[]) { sink_name = pa_xstrdup(argv[optind+1]); port_name = pa_xstrdup(argv[optind+2]); + } else if (pa_streq(argv[optind], "set-default-sink")) { + action = SET_DEFAULT_SINK; + + if (argc != optind+2) { + pa_log(_("You have to specify a sink name")); + goto quit; + } + + sink_name = pa_xstrdup(argv[optind+1]); + } else if (pa_streq(argv[optind], "set-source-port")) { action = SET_SOURCE_PORT; @@ -1550,36 +1887,46 @@ int main(int argc, char *argv[]) { source_name = pa_xstrdup(argv[optind+1]); port_name = pa_xstrdup(argv[optind+2]); + } else if (pa_streq(argv[optind], "set-default-source")) { + action = SET_DEFAULT_SOURCE; + + if (argc != optind+2) { + pa_log(_("You have to specify a source name")); + goto quit; + } + + source_name = pa_xstrdup(argv[optind+1]); + } else if (pa_streq(argv[optind], "set-sink-volume")) { action = SET_SINK_VOLUME; - if (argc != optind+3) { + if (argc < optind+3) { pa_log(_("You have to specify a sink name/index and a volume")); goto quit; } sink_name = pa_xstrdup(argv[optind+1]); - if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0) + if (parse_volumes(argv+optind+2, argc-3) < 0) goto quit; } else if (pa_streq(argv[optind], "set-source-volume")) { action = SET_SOURCE_VOLUME; - if (argc != optind+3) { + if (argc < optind+3) { pa_log(_("You have to specify a source name/index and a volume")); goto quit; } source_name = pa_xstrdup(argv[optind+1]); - if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0) + if (parse_volumes(argv+optind+2, argc-3) < 0) goto quit; } else if (pa_streq(argv[optind], "set-sink-input-volume")) { action = SET_SINK_INPUT_VOLUME; - if (argc != optind+3) { + if (argc < optind+3) { pa_log(_("You have to specify a sink input index and a volume")); goto quit; } @@ -1589,13 +1936,13 @@ int main(int argc, char *argv[]) { goto quit; } - if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0) + if (parse_volumes(argv+optind+2, argc-3) < 0) goto quit; } else if (pa_streq(argv[optind], "set-source-output-volume")) { action = SET_SOURCE_OUTPUT_VOLUME; - if (argc != optind+3) { + if (argc < optind+3) { pa_log(_("You have to specify a source output index and a volume")); goto quit; } @@ -1605,11 +1952,10 @@ int main(int argc, char *argv[]) { goto quit; } - if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0) + if (parse_volumes(argv+optind+2, argc-3) < 0) goto quit; } else if (pa_streq(argv[optind], "set-sink-mute")) { - int b; action = SET_SINK_MUTE; if (argc != optind+3) { @@ -1617,16 +1963,14 @@ int main(int argc, char *argv[]) { goto quit; } - if ((b = pa_parse_boolean(argv[optind+2])) < 0) { + if ((mute = parse_mute(argv[optind+2])) == INVALID_MUTE) { pa_log(_("Invalid mute specification")); goto quit; } sink_name = pa_xstrdup(argv[optind+1]); - mute = b; } else if (pa_streq(argv[optind], "set-source-mute")) { - int b; action = SET_SOURCE_MUTE; if (argc != optind+3) { @@ -1634,16 +1978,14 @@ int main(int argc, char *argv[]) { goto quit; } - if ((b = pa_parse_boolean(argv[optind+2])) < 0) { + if ((mute = parse_mute(argv[optind+2])) == INVALID_MUTE) { pa_log(_("Invalid mute specification")); goto quit; } source_name = pa_xstrdup(argv[optind+1]); - mute = b; } else if (pa_streq(argv[optind], "set-sink-input-mute")) { - int b; action = SET_SINK_INPUT_MUTE; if (argc != optind+3) { @@ -1656,18 +1998,61 @@ int main(int argc, char *argv[]) { goto quit; } - if ((b = pa_parse_boolean(argv[optind+2])) < 0) { + if ((mute = parse_mute(argv[optind+2])) == INVALID_MUTE) { pa_log(_("Invalid mute specification")); goto quit; } - mute = b; + } else if (pa_streq(argv[optind], "set-source-output-mute")) { + action = SET_SOURCE_OUTPUT_MUTE; + + if (argc != optind+3) { + pa_log(_("You have to specify a source output index and a mute boolean")); + goto quit; + } + + if (pa_atou(argv[optind+1], &source_output_idx) < 0) { + pa_log(_("Invalid source output index specification")); + goto quit; + } + + if ((mute = parse_mute(argv[optind+2])) == INVALID_MUTE) { + pa_log(_("Invalid mute specification")); + goto quit; + } } else if (pa_streq(argv[optind], "subscribe")) action = SUBSCRIBE; - else if (pa_streq(argv[optind], "help")) { + else if (pa_streq(argv[optind], "set-sink-formats")) { + int32_t tmp; + + if (argc != optind+3 || pa_atoi(argv[optind+1], &tmp) < 0) { + pa_log(_("You have to specify a sink index and a semicolon-separated list of supported formats")); + goto quit; + } + + sink_idx = tmp; + action = SET_SINK_FORMATS; + formats = pa_xstrdup(argv[optind+2]); + + } else if (pa_streq(argv[optind], "set-port-latency-offset")) { + action = SET_PORT_LATENCY_OFFSET; + + if (argc != optind+4) { + pa_log(_("You have to specify a card name/index, a port name and a latency offset")); + goto quit; + } + + card_name = pa_xstrdup(argv[optind+1]); + port_name = pa_xstrdup(argv[optind+2]); + if (pa_atoi(argv[optind + 3], &latency_offset) < 0) { + pa_log(_("Could not parse latency offset")); + goto quit; + } + + } else if (pa_streq(argv[optind], "help")) { help(bn); ret = 0; goto quit; @@ -1728,6 +2113,7 @@ quit: pa_xfree(card_name); pa_xfree(profile_name); pa_xfree(port_name); + pa_xfree(formats); if (sndfile) sf_close(sndfile);