aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-17 19:59:52 +0200
committerMax Kellermann <max@duempel.org>2011-09-17 19:59:52 +0200
commit47774ce882873578425546f13fefc10073e5e9e0 (patch)
tree0b6f9304478c0c3a170b6612f1020d69428ac22c
parent3c9bcdd34701196c3d662888c3506a2a001cb252 (diff)
parent79435dbdec9649f85af245ba6be4c8257e3a63bc (diff)
downloadmpd-47774ce882873578425546f13fefc10073e5e9e0.tar.gz
mpd-47774ce882873578425546f13fefc10073e5e9e0.tar.xz
mpd-47774ce882873578425546f13fefc10073e5e9e0.zip
Merge branch 'v0.16.x'
-rw-r--r--src/decoder/audiofile_decoder_plugin.c1
-rw-r--r--src/output/pulse_output_plugin.c22
2 files changed, 12 insertions, 11 deletions
diff --git a/src/decoder/audiofile_decoder_plugin.c b/src/decoder/audiofile_decoder_plugin.c
index 0cf54bc60..8d6236a57 100644
--- a/src/decoder/audiofile_decoder_plugin.c
+++ b/src/decoder/audiofile_decoder_plugin.c
@@ -25,6 +25,7 @@
#include <af_vfs.h>
#include <assert.h>
#include <glib.h>
+#include <stdio.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "audiofile"
diff --git a/src/output/pulse_output_plugin.c b/src/output/pulse_output_plugin.c
index 12b68fc3c..22e21d729 100644
--- a/src/output/pulse_output_plugin.c
+++ b/src/output/pulse_output_plugin.c
@@ -291,6 +291,8 @@ pulse_output_delete_stream(struct pulse_output *po)
/**
* Frees and clears the context.
+ *
+ * Caller must lock the main loop.
*/
static void
pulse_output_delete_context(struct pulse_output *po)
@@ -309,6 +311,8 @@ pulse_output_delete_context(struct pulse_output *po)
/**
* Create, set up and connect a context.
*
+ * Caller must lock the main loop.
+ *
* @return true on success, false on error
*/
static bool
@@ -399,12 +403,8 @@ pulse_output_enable(void *data, GError **error_r)
return false;
}
- pa_threaded_mainloop_unlock(po->mainloop);
-
/* create the libpulse context and connect it */
- pa_threaded_mainloop_lock(po->mainloop);
-
if (!pulse_output_setup_context(po, error_r)) {
pa_threaded_mainloop_unlock(po->mainloop);
pa_threaded_mainloop_stop(po->mainloop);
@@ -436,6 +436,8 @@ pulse_output_disable(void *data)
* Check if the context is (already) connected, and waits if not. If
* the context has been disconnected, retry to connect.
*
+ * Caller must lock the main loop.
+ *
* @return true on success, false on error
*/
static bool
@@ -445,8 +447,6 @@ pulse_output_wait_connection(struct pulse_output *po, GError **error_r)
pa_context_state_t state;
- pa_threaded_mainloop_lock(po->mainloop);
-
if (po->context == NULL && !pulse_output_setup_context(po, error_r))
return false;
@@ -455,7 +455,6 @@ pulse_output_wait_connection(struct pulse_output *po, GError **error_r)
switch (state) {
case PA_CONTEXT_READY:
/* nothing to do */
- pa_threaded_mainloop_unlock(po->mainloop);
return true;
case PA_CONTEXT_UNCONNECTED:
@@ -466,7 +465,6 @@ pulse_output_wait_connection(struct pulse_output *po, GError **error_r)
"failed to connect: %s",
pa_strerror(pa_context_errno(po->context)));
pulse_output_delete_context(po);
- pa_threaded_mainloop_unlock(po->mainloop);
return false;
case PA_CONTEXT_CONNECTING:
@@ -584,6 +582,8 @@ pulse_output_open(void *data, struct audio_format *audio_format,
assert(po->mainloop != NULL);
+ pa_threaded_mainloop_lock(po->mainloop);
+
if (po->context != NULL) {
switch (pa_context_get_state(po->context)) {
case PA_CONTEXT_UNCONNECTED:
@@ -603,8 +603,10 @@ pulse_output_open(void *data, struct audio_format *audio_format,
}
}
- if (!pulse_output_wait_connection(po, error_r))
+ if (!pulse_output_wait_connection(po, error_r)) {
+ pa_threaded_mainloop_unlock(po->mainloop);
return false;
+ }
/* MPD doesn't support the other pulseaudio sample formats, so
we just force MPD to send us everything as 16 bit */
@@ -614,8 +616,6 @@ pulse_output_open(void *data, struct audio_format *audio_format,
ss.rate = audio_format->sample_rate;
ss.channels = audio_format->channels;
- pa_threaded_mainloop_lock(po->mainloop);
-
/* create a stream .. */
if (!pulse_output_setup_stream(po, &ss, error_r)) {