From 7a1a1478819c0f4716f0612f1121a0429f455fa9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 3 Oct 2008 22:21:27 +0200 Subject: rename pa_cvolume_snprint_dB to pa_sw_cvolume_snprint_dB since it is useful only for software volumes --- src/map-file | 2 +- src/pulse/volume.c | 2 +- src/pulse/volume.h | 4 ++-- src/tests/voltest.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/map-file b/src/map-file index 50cb780a..7211914a 100644 --- a/src/map-file +++ b/src/map-file @@ -105,7 +105,7 @@ pa_cvolume_max; pa_cvolume_remap; pa_cvolume_set; pa_cvolume_snprint; -pa_cvolume_snprint_dB; +pa_sw_cvolume_snprint_dB; pa_cvolume_valid; pa_ext_stream_restore_delete; pa_ext_stream_restore_read; diff --git a/src/pulse/volume.c b/src/pulse/volume.c index 0ef02d98..0412819d 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c @@ -170,7 +170,7 @@ char *pa_cvolume_snprint(char *s, size_t l, const pa_cvolume *c) { return s; } -char *pa_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c) { +char *pa_sw_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c) { unsigned channel; pa_bool_t first = TRUE; char *e; diff --git a/src/pulse/volume.h b/src/pulse/volume.h index 9f6e5f05..bfd8ca5b 100644 --- a/src/pulse/volume.h +++ b/src/pulse/volume.h @@ -145,10 +145,10 @@ char *pa_cvolume_snprint(char *s, size_t l, const pa_cvolume *c); * any release without warning and without being considered API or ABI * breakage. You should not use this definition anywhere where it * might become part of an ABI. \since 0.9.13 */ -#define PA_CVOLUME_SNPRINT_DB_MAX 448 +#define PA_SW_CVOLUME_SNPRINT_DB_MAX 448 /** Pretty print a volume structure but show dB values. \since 0.9.13 */ -char *pa_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c); +char *pa_sw_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c); /** Return the average volume of all channels */ pa_volume_t pa_cvolume_avg(const pa_cvolume *a) PA_GCC_PURE; diff --git a/src/tests/voltest.c b/src/tests/voltest.c index bbf3ea1c..5bfc97e0 100644 --- a/src/tests/voltest.c +++ b/src/tests/voltest.c @@ -17,14 +17,14 @@ int main(int argc, char *argv[]) { } for (v = PA_VOLUME_MUTED; v <= PA_VOLUME_NORM*2; v += 256) { - char s[PA_CVOLUME_SNPRINT_MAX], t[PA_CVOLUME_SNPRINT_DB_MAX]; + char s[PA_CVOLUME_SNPRINT_MAX], t[PA_SW_CVOLUME_SNPRINT_DB_MAX]; pa_cvolume_set(&cv, 2, v); printf("Volume: %3i [%s] [%s]\n", v, pa_cvolume_snprint(s, sizeof(s), &cv), - pa_cvolume_snprint_dB(t, sizeof(t), &cv)); + pa_sw_cvolume_snprint_dB(t, sizeof(t), &cv)); } -- cgit