From 439a05d8c3c31ff4751a03dba69dfb96321a83e2 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 6 Sep 2014 02:30:57 +0200
Subject: 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.
---
 audio/out/ao_sndio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'audio/out/ao_sndio.c')

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;
-- 
cgit v1.2.3