diff options
author | wm4 <wm4@nowhere> | 2014-09-06 02:30:57 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-06 02:30:57 +0200 |
commit | 439a05d8c3c31ff4751a03dba69dfb96321a83e2 (patch) | |
tree | 270d1fa8ce2db5c3fb67771268382ef5523de38e /audio/out/ao_pulse.c | |
parent | 197f18402ed1e38e8e151a912e416e0b86d277d2 (diff) | |
download | mpv-439a05d8c3c31ff4751a03dba69dfb96321a83e2.tar.bz2 mpv-439a05d8c3c31ff4751a03dba69dfb96321a83e2.tar.xz |
audio/out: remove old things
Remove the unnecessary indirection through ao fields.
Also fix the inverted result of AOCONTROL_HAS_TEMP_VOLUME. Hopefully the
change is equivalent. But actually, it looks like the old code did it
wrong.
Diffstat (limited to 'audio/out/ao_pulse.c')
-rw-r--r-- | audio/out/ao_pulse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 14b5161940..d6bb675b3c 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -284,8 +284,6 @@ static int init(struct ao *ao) pthread_mutex_init(&priv->wakeup_lock, NULL); pthread_cond_init(&priv->wakeup, NULL); - ao->per_application_mixer = true; - if (!(priv->mainloop = pa_threaded_mainloop_new())) { MP_ERR(ao, "Failed to allocate main loop\n"); goto fail; @@ -644,6 +642,9 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg) return CONTROL_OK; } + case AOCONTROL_HAS_PER_APP_VOLUME: + return CONTROL_TRUE; + case AOCONTROL_UPDATE_STREAM_TITLE: { char *title = (char *)arg; pa_threaded_mainloop_lock(priv->mainloop); |