From 5449d793ae7800ad236f027f6c6893a1d2db3929 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 27 Jan 2009 02:45:37 +0100 Subject: swap argument order of pa_cvolume_get_balance() to be a bit more systematic --- src/pulse/volume.c | 4 ++-- src/pulse/volume.h | 4 ++-- src/pulsecore/cli-text.c | 8 ++++---- src/tests/voltest.c | 8 ++++---- src/utils/pactl.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/pulse/volume.c b/src/pulse/volume.c index 2c977845..822fe391 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c @@ -435,7 +435,7 @@ static void get_avg_lr(const pa_channel_map *map, const pa_cvolume *v, pa_volume *r = right / n_right; } -float pa_cvolume_get_balance(const pa_channel_map *map, const pa_cvolume *v) { +float pa_cvolume_get_balance(const pa_cvolume *v, const pa_channel_map *map) { pa_volume_t left, right; pa_assert(v); @@ -462,7 +462,7 @@ float pa_cvolume_get_balance(const pa_channel_map *map, const pa_cvolume *v) { return 1.0f - ((float) left / (float) right); } -pa_cvolume* pa_cvolume_set_balance(const pa_channel_map *map, pa_cvolume *v, float new_balance) { +pa_cvolume* pa_cvolume_set_balance(pa_cvolume *v, const pa_channel_map *map, float new_balance) { pa_volume_t left, nleft, right, nright, m; unsigned c; diff --git a/src/pulse/volume.h b/src/pulse/volume.h index e8670ab3..c1967b31 100644 --- a/src/pulse/volume.h +++ b/src/pulse/volume.h @@ -237,7 +237,7 @@ int pa_cvolume_compatible(const pa_cvolume *v, const pa_sample_spec *ss) PA_GCC_ /** Calculate a 'balance' value for the specified volume with the * specified channel map. The return value will range from -1.0f * (left) to +1.0f (right) \since 0.9.15 */ -float pa_cvolume_get_balance(const pa_channel_map *map, const pa_cvolume *v) PA_GCC_PURE; +float pa_cvolume_get_balance(const pa_cvolume *v, const pa_channel_map *map) PA_GCC_PURE; /** Adjust the 'balance' value for the specified volume with the * specified channel map. v will be modified in place and @@ -246,7 +246,7 @@ float pa_cvolume_get_balance(const pa_channel_map *map, const pa_cvolume *v) PA_ * pa_cvolume_get_balance() is not guaranteed to actually return the * requested balance (e.g. when the input volume was zero anyway for * all channels) \since 0.9.15 */ -pa_cvolume* pa_cvolume_set_balance(const pa_channel_map *map, pa_cvolume *v, float new_balance); +pa_cvolume* pa_cvolume_set_balance(pa_cvolume *v, const pa_channel_map *map, float new_balance); /** Scale the passed pa_cvolume structure so that the maximum volume * of all channels equals max. The proportions between the channel diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c index 7f3a745f..e87abe04 100644 --- a/src/pulsecore/cli-text.c +++ b/src/pulsecore/cli-text.c @@ -261,7 +261,7 @@ char *pa_sink_list_to_string(pa_core *c) { pa_cvolume_snprint(cv, sizeof(cv), pa_sink_get_volume(sink, FALSE)), sink->flags & PA_SINK_DECIBEL_VOLUME ? "\n\t " : "", sink->flags & PA_SINK_DECIBEL_VOLUME ? pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), pa_sink_get_volume(sink, FALSE)) : "", - pa_cvolume_get_balance(&sink->channel_map, pa_sink_get_volume(sink, FALSE)), + pa_cvolume_get_balance(pa_sink_get_volume(sink, FALSE), &sink->channel_map), pa_volume_snprint(v, sizeof(v), sink->base_volume), sink->flags & PA_SINK_DECIBEL_VOLUME ? "\n\t " : "", sink->flags & PA_SINK_DECIBEL_VOLUME ? pa_sw_volume_snprint_dB(vdb, sizeof(vdb), sink->base_volume) : "", @@ -349,7 +349,7 @@ char *pa_source_list_to_string(pa_core *c) { pa_cvolume_snprint(cv, sizeof(cv), pa_source_get_volume(source, FALSE)), source->flags & PA_SOURCE_DECIBEL_VOLUME ? "\n\t " : "", source->flags & PA_SOURCE_DECIBEL_VOLUME ? pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), pa_source_get_volume(source, FALSE)) : "", - pa_cvolume_get_balance(&source->channel_map, pa_source_get_volume(source, FALSE)), + pa_cvolume_get_balance(pa_source_get_volume(source, FALSE), &source->channel_map), pa_volume_snprint(v, sizeof(v), source->base_volume), source->flags & PA_SOURCE_DECIBEL_VOLUME ? "\n\t " : "", source->flags & PA_SOURCE_DECIBEL_VOLUME ? pa_sw_volume_snprint_dB(vdb, sizeof(vdb), source->base_volume) : "", @@ -519,7 +519,7 @@ char *pa_sink_input_list_to_string(pa_core *c) { i->sink->index, i->sink->name, pa_cvolume_snprint(cv, sizeof(cv), pa_sink_input_get_volume(i)), pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), pa_sink_input_get_volume(i)), - pa_cvolume_get_balance(&i->channel_map, pa_sink_input_get_volume(i)), + pa_cvolume_get_balance(pa_sink_input_get_volume(i), &i->channel_map), pa_yes_no(pa_sink_input_get_mute(i)), (double) pa_sink_input_get_latency(i, NULL) / PA_USEC_PER_MSEC, clt, @@ -590,7 +590,7 @@ char *pa_scache_list_to_string(pa_core *c) { l, pa_cvolume_snprint(cv, sizeof(cv), &e->volume), pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &e->volume), - e->memchunk.memblock ? pa_cvolume_get_balance(&e->channel_map, &e->volume) : 0.0f, + e->memchunk.memblock ? pa_cvolume_get_balance(&e->volume, &e->channel_map) : 0.0f, pa_yes_no(e->lazy), e->filename ? e->filename : "n/a"); diff --git a/src/tests/voltest.c b/src/tests/voltest.c index 879d86b9..0c6d2ea6 100644 --- a/src/tests/voltest.c +++ b/src/tests/voltest.c @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) { for (cv.values[1] = PA_VOLUME_MUTED; cv.values[1] <= PA_VOLUME_NORM*2; cv.values[1] += 4096) { char s[PA_CVOLUME_SNPRINT_MAX]; - printf("Volume: [%s]; balance: %2.1f\n", pa_cvolume_snprint(s, sizeof(s), &cv), pa_cvolume_get_balance(&map, &cv)); + printf("Volume: [%s]; balance: %2.1f\n", pa_cvolume_snprint(s, sizeof(s), &cv), pa_cvolume_get_balance(&cv, &map)); } for (cv.values[0] = PA_VOLUME_MUTED+4096; cv.values[0] <= PA_VOLUME_NORM*2; cv.values[0] += 4096) @@ -48,12 +48,12 @@ int main(int argc, char *argv[]) { pa_cvolume r; float k; - printf("Before: volume: [%s]; balance: %2.1f\n", pa_cvolume_snprint(s, sizeof(s), &cv), pa_cvolume_get_balance(&map, &cv)); + printf("Before: volume: [%s]; balance: %2.1f\n", pa_cvolume_snprint(s, sizeof(s), &cv), pa_cvolume_get_balance(&cv, &map)); r = cv; - pa_cvolume_set_balance(&map, &r, b); + pa_cvolume_set_balance(&r, &map,b); - k = pa_cvolume_get_balance(&map, &r); + k = pa_cvolume_get_balance(&r, &map); printf("After: volume: [%s]; balance: %2.1f (intended: %2.1f) %s\n", pa_cvolume_snprint(s, sizeof(s), &r), k, b, k < b-.05 || k > b+.5 ? "MISMATCH" : ""); } diff --git a/src/utils/pactl.c b/src/utils/pactl.c index 08206410..154e7f9c 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -216,7 +216,7 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_ 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_get_balance(&i->channel_map, &i->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) : "", @@ -296,7 +296,7 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int 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_get_balance(&i->channel_map, &i->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) : "", @@ -483,7 +483,7 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info 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_get_balance(&i->channel_map, &i->volume), + pa_cvolume_get_balance(&i->volume, &i->channel_map), (double) i->buffer_usec, (double) i->sink_usec, i->resample_method ? i->resample_method : _("n/a"), @@ -584,7 +584,7 @@ static void get_sample_info_callback(pa_context *c, const pa_sample_info *i, int 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_get_balance(&i->channel_map, &i->volume), + pa_cvolume_get_balance(&i->volume, &i->channel_map), (double) i->duration/1000000.0, t, pa_yes_no(i->lazy), -- cgit