remap: Change remapping function argument type from void to int16_t / float as approp...

[pulseaudio] / src / pulsecore / mime-type.c

diff --git a/src/pulsecore/mime-type.c b/src/pulsecore/mime-type.c
index b9fe9444da85afb2fe6ad6a056bc4f945a68a0cc..60e42e78dbf1f6f1d434f857fabe4ccd07eeea72 100644 (file)
--- a/src/pulsecore/mime-type.c
+++ b/src/pulsecore/mime-type.c
@@ -28,7 +28,7 @@
 
 #include "mime-type.h"
 
-pa_bool_t pa_sample_spec_is_mime(const pa_sample_spec *ss, const pa_channel_map *cm) {
+bool pa_sample_spec_is_mime(const pa_sample_spec *ss, const pa_channel_map *cm) {
 
     pa_assert(pa_channel_map_compatible(cm, ss));
 
@@ -45,33 +45,33 @@ pa_bool_t pa_sample_spec_is_mime(const pa_sample_spec *ss, const pa_channel_map
                 ss->rate != 32000 &&
                 ss->rate != 44100 &&
                 ss->rate != 48000)
-                return FALSE;
+                return false;
 
             if (ss->channels != 1 &&
                 ss->channels != 2)
-                return FALSE;
+                return false;
 
             if ((cm->channels == 1 && cm->map[0] != PA_CHANNEL_POSITION_MONO) ||
                 (cm->channels == 2 && (cm->map[0] != PA_CHANNEL_POSITION_LEFT || cm->map[1] != PA_CHANNEL_POSITION_RIGHT)))
-                return FALSE;
+                return false;
 
-            return TRUE;
+            return true;
 
         case PA_SAMPLE_ULAW:
 
             if (ss->rate != 8000)
-                return FALSE;
+                return false;
 
             if (ss->channels != 1)
-                return FALSE;
+                return false;
 
             if (cm->map[0] != PA_CHANNEL_POSITION_MONO)
-                return FALSE;
+                return false;
 
-            return TRUE;
+            return true;
 
         default:
-            return FALSE;
+            return false;
     }
 }
 
@@ -145,6 +145,7 @@ void pa_sample_spec_mimefy(pa_sample_spec *ss, pa_channel_map *cm) {
 
 char *pa_sample_spec_to_mime_type(const pa_sample_spec *ss, const pa_channel_map *cm) {
     pa_assert(pa_channel_map_compatible(cm, ss));
+    pa_assert(pa_sample_spec_valid(ss));
 
     if (!pa_sample_spec_is_mime(ss, cm))
         return NULL;
@@ -168,8 +169,6 @@ char *pa_sample_spec_to_mime_type(const pa_sample_spec *ss, const pa_channel_map
         default:
             pa_assert_not_reached();
     }
-
-    pa_assert(pa_sample_spec_valid(ss));
 }
 
 char *pa_sample_spec_to_mime_type_mimefy(const pa_sample_spec *_ss, const pa_channel_map *_cm) {