rename pa_cvolume_snprint_dB to pa_sw_cvolume_snprint_dB since it is

useful only for software volumes

diff --git a/src/map-file b/src/map-file
index 50cb780a81d30209e1bf3fabfd19bb7108712211..7211914aab716647f3e28694050735f29550f3bc 100644 (file)
--- 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 0ef02d98151c021bc3cab8f61721c87bf4d71009..0412819d313ccab274a413e8535ba669317f1843 100644 (file)
--- 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 9f6e5f057eaa1d0ef253255290c5c19701577684..bfd8ca5bca854dc14738cefb809317a1d56a5349 100644 (file)
--- 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 bbf3ea1cec0189b65cedeb0533df2df15b39880d..5bfc97e08cd18ee199db634605a6b86274c9424c 100644 (file)
--- 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));
 
     }