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

[pulseaudio] / src / pulsecore / ratelimit.c

diff --git a/src/pulsecore/ratelimit.c b/src/pulsecore/ratelimit.c
index 29e6fb102b046ee80d577f9f08c82e1f62855ef4..37e46c821c1202bd6dec135ffee0a96760afc169 100644 (file)
--- a/src/pulsecore/ratelimit.c
+++ b/src/pulsecore/ratelimit.c
@@ -23,24 +23,25 @@
 #include <config.h>
 #endif
 
-#include <pulsecore/rtclock.h>
+#include <pulse/rtclock.h>
+
 #include <pulsecore/log.h>
 #include <pulsecore/mutex.h>
 
 #include "ratelimit.h"
 
-static pa_static_mutex mutex;
+static pa_static_mutex mutex = PA_STATIC_MUTEX_INIT;
 
 /* Modelled after Linux' lib/ratelimit.c by Dave Young
  * <hidave.darkstar@gmail.com>, which is licensed GPLv2. */
 
-pa_bool_t pa_ratelimit_test(pa_ratelimit *r) {
+bool pa_ratelimit_test(pa_ratelimit *r, pa_log_level_t t) {
     pa_usec_t now;
     pa_mutex *m;
 
-    now = pa_rtclock_usec();
+    now = pa_rtclock_now();
 
-    m = pa_static_mutex_get(&mutex, FALSE, FALSE);
+    m = pa_static_mutex_get(&mutex, false, false);
     pa_mutex_lock(m);
 
     pa_assert(r);
@@ -51,7 +52,7 @@ pa_bool_t pa_ratelimit_test(pa_ratelimit *r) {
         r->begin + r->interval < now) {
 
         if (r->n_missed > 0)
-            pa_log_warn("%u events suppressed", r->n_missed);
+            pa_logl(t, "%u events suppressed", r->n_missed);
 
         r->begin = now;
 
@@ -66,10 +67,10 @@ pa_bool_t pa_ratelimit_test(pa_ratelimit *r) {
 
     r->n_missed++;
     pa_mutex_unlock(m);
-    return FALSE;
+    return false;
 
 good:
     r->n_printed++;
     pa_mutex_unlock(m);
-    return TRUE;
+    return true;
 }