summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
Diffstat (limited to 'audio/out')
-rw-r--r--audio/out/ao_pulse.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index 3ce11008ff..d0af2a856c 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -53,7 +53,6 @@ struct priv {
// temporary during control()
struct pa_sink_input_info pi;
- bool broken_pause;
int retval;
// for wakeup handling
@@ -280,26 +279,12 @@ static int init(struct ao *ao)
struct priv *priv = ao->priv;
char *host = priv->cfg_host && priv->cfg_host[0] ? priv->cfg_host : NULL;
char *sink = priv->cfg_sink && priv->cfg_sink[0] ? priv->cfg_sink : NULL;
- const char *version = pa_get_library_version();
pthread_mutex_init(&priv->wakeup_lock, NULL);
pthread_cond_init(&priv->wakeup, NULL);
ao->per_application_mixer = true;
- priv->broken_pause = false;
- /* not sure which versions are affected, assume 0.9.11* to 0.9.14*
- * known bad: 0.9.14, 0.9.13
- * known good: 0.9.9, 0.9.10, 0.9.15
- * To test: pause, wait ca. 5 seconds, framestep and see if MPlayer
- * hangs somewhen. */
- if (strncmp(version, "0.9.1", 5) == 0 && version[5] >= '1'
- && version[5] <= '4') {
- MP_WARN(ao, "working around probably broken pause functionality,\n"
- " see http://www.pulseaudio.org/ticket/440\n");
- priv->broken_pause = true;
- }
-
if (!(priv->mainloop = pa_threaded_mainloop_new())) {
MP_ERR(ao, "Failed to allocate main loop\n");
goto fail;
@@ -465,12 +450,6 @@ static void pause(struct ao *ao)
// Resume the audio stream by uncorking it on the server
static void resume(struct ao *ao)
{
- struct priv *priv = ao->priv;
- /* Without this, certain versions will cause an infinite hang because
- * pa_stream_writable_size returns 0 always.
- * Note that this workaround causes A-V desync after pause. */
- if (priv->broken_pause)
- reset(ao);
cork(ao, false);
}