Match trailing equal sign in slurp_battery_info.

[i3/i3status] / src / pulse.c

diff --git a/src/pulse.c b/src/pulse.c
index 76e2495367ad77564ab2a727d0063abeccaaf484..33980143b70c6e52eb30f3ce512509e8d0d1fb2b 100644 (file)
--- a/src/pulse.c
+++ b/src/pulse.c
@@ -1,6 +1,8 @@
 // vim:ts=4:sw=4:expandtab
 #include <string.h>
 #include <stdio.h>
+#include <math.h>
+#include <signal.h>
 #include <pulse/pulseaudio.h>
 #include "i3status.h"
 #include "queue.h"
@@ -18,6 +20,7 @@ static pa_threaded_mainloop *main_loop = NULL;
 static pa_context *context = NULL;
 static pa_mainloop_api *api = NULL;
 static bool context_ready = false;
+static bool mainloop_thread_running = false;
 static uint32_t default_sink_idx = DEFAULT_SINK_INDEX;
 TAILQ_HEAD(tailhead, indexed_volume_s) cached_volume =
     TAILQ_HEAD_INITIALIZER(cached_volume);
@@ -78,18 +81,17 @@ static void store_volume_from_sink_cb(pa_context *c,
         return;
 
     int avg_vol = pa_cvolume_avg(&info->volume);
-    int vol_perc = (int)((long long)avg_vol * 100 / PA_VOLUME_NORM);
+    int vol_perc = roundf((float)avg_vol * 100 / PA_VOLUME_NORM);
+    int composed_volume = COMPOSE_VOLUME_MUTE(vol_perc, info->mute);
 
     /* if this is the default sink we must try to save it twice: once with
      * DEFAULT_SINK_INDEX as the index, and another with its proper value
      * (using bitwise OR to avoid early-out logic) */
     if ((info->index == default_sink_idx &&
-         save_volume(DEFAULT_SINK_INDEX, vol_perc)) |
-        save_volume(info->index, vol_perc)) {
-        /* if the volume changed, wake the main thread */
-        pthread_mutex_lock(&i3status_sleep_mutex);
-        pthread_cond_broadcast(&i3status_sleep_cond);
-        pthread_mutex_unlock(&i3status_sleep_mutex);
+         save_volume(DEFAULT_SINK_INDEX, composed_volume)) |
+        save_volume(info->index, composed_volume)) {
+        /* if the volume or mute flag changed, wake the main thread */
+        pthread_kill(main_thread, SIGUSR1);
     }
 }
 
@@ -151,6 +153,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
         case PA_CONTEXT_SETTING_NAME:
         case PA_CONTEXT_TERMINATED:
         default:
+            context_ready = false;
             break;
 
         case PA_CONTEXT_READY: {
@@ -168,7 +171,10 @@ static void context_state_callback(pa_context *c, void *userdata) {
         } break;
 
         case PA_CONTEXT_FAILED:
-            pulseaudio_error_log(c);
+            /* server disconnected us, attempt to reconnect */
+            context_ready = false;
+            pa_context_unref(context);
+            context = NULL;
             break;
     }
 }
@@ -234,12 +240,14 @@ bool pulse_initialize(void) {
             pulseaudio_error_log(context);
             return false;
         }
-        if (pa_threaded_mainloop_start(main_loop) < 0) {
+        if (!mainloop_thread_running &&
+            pa_threaded_mainloop_start(main_loop) < 0) {
             pulseaudio_error_log(context);
             pa_threaded_mainloop_free(main_loop);
             main_loop = NULL;
             return false;
         }
+        mainloop_thread_running = true;
     }
     return true;
 }