diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/print_wireless_info.c | 4 | ||||
| -rw-r--r-- | src/pulse.c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c index 4f92507..25e167f 100644 --- a/src/print_wireless_info.c +++ b/src/print_wireless_info.c @@ -15,6 +15,10 @@ #define IW_ESSID_MAX_SIZE 32 #endif +#ifdef __APPLE__ +#define IW_ESSID_MAX_SIZE 32 +#endif + #ifdef __FreeBSD__ #include <sys/param.h> #include <sys/ioctl.h> diff --git a/src/pulse.c b/src/pulse.c index f9ed5d3..3398014 100644 --- a/src/pulse.c +++ b/src/pulse.c @@ -20,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); @@ -152,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: { @@ -169,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; } } @@ -235,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; } |