summaryrefslogtreecommitdiffstats
path: root/src/utils/pactl.c
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2011-05-15 13:14:33 +0100
committerColin Guthrie <colin@mageia.org>2011-05-15 13:14:33 +0100
commit26b4bd74aa92ed51a33a59af46ec32d7e5b66628 (patch)
treeba0105baedff9f796f89b31b10953748a119d644 /src/utils/pactl.c
parentbe4208d0799f21663f58f50430b4883e87709480 (diff)
parent7ebc5033637d7f0ca8ece80259d8a5dc6b30557b (diff)
Merge branch 'passthrough'
Diffstat (limited to 'src/utils/pactl.c')
-rw-r--r--src/utils/pactl.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 194183d4..7be7049f 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -222,7 +222,8 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_
cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX],
v[PA_VOLUME_SNPRINT_MAX],
vdb[PA_SW_VOLUME_SNPRINT_DB_MAX],
- cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+ cm[PA_CHANNEL_MAP_SNPRINT_MAX],
+ f[PA_FORMAT_INFO_SNPRINT_MAX];
char *pl;
if (is_last < 0) {
@@ -307,6 +308,14 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_
if (i->active_port)
printf(_("\tActive Port: %s\n"),
i->active_port->name);
+
+ if (i->formats) {
+ uint8_t j;
+
+ printf(_("\tFormats:\n"));
+ for (j = 0; j < i->n_formats; j++)
+ printf("\t\t%s\n", pa_format_info_snprint(f, sizeof(f), i->formats[j]));
+ }
}
static void get_source_info_callback(pa_context *c, const pa_source_info *i, int is_last, void *userdata) {
@@ -551,7 +560,7 @@ static void get_card_info_callback(pa_context *c, const pa_card_info *i, int is_
}
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];
+ 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 *pl;
if (is_last < 0) {
@@ -591,6 +600,7 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info
"\tSink: %u\n"
"\tSample Specification: %s\n"
"\tChannel Map: %s\n"
+ "\tFormat: %s\n"
"\tMute: %s\n"
"\tVolume: %s\n"
"\t %s\n"
@@ -606,6 +616,7 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info
i->sink,
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->mute),
pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume),