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_sndio.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_sndio.c')
-rw-r--r-- | audio/out/ao_sndio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c index 286f158260..12bc6a97b2 100644 --- a/audio/out/ao_sndio.c +++ b/audio/out/ao_sndio.c @@ -60,6 +60,8 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg) return CONTROL_FALSE; sio_setvol(p->hdl, vol->left * SIO_MAXVOL / 100); break; + case AOCONTROL_HAS_SOFT_VOLUME: + return CONTROL_TRUE; default: return CONTROL_UNKNOWN; } @@ -193,7 +195,6 @@ static int init(struct ao *ao) } ao->bps = p->par.bps * p->par.pchan * p->par.rate; - ao->no_persistent_volume = true; p->havevol = sio_onvol(p->hdl, volcb, p); sio_onmove(p->hdl, movecb, p); p->delay = 0; |