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_openal.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c
index f2cbe78e94..73ad0857d4 100644
--- a/audio/out/ao_openal.c
+++ b/audio/out/ao_openal.c
@@ -76,6 +76,8 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg)
         vol->left = vol->right = volume * 100;
         return CONTROL_TRUE;
     }
+    case AOCONTROL_HAS_SOFT_VOLUME:
+        return CONTROL_TRUE;
     }
     return CONTROL_UNKNOWN;
 }
@@ -132,7 +134,6 @@ static int init(struct ao *ao)
         return -1;
     }
     ao_data = ao;
-    ao->no_persistent_volume = true;
     struct mp_chmap_sel sel = {0};
     for (i = 0; speaker_pos[i].id != -1; i++)
         mp_chmap_sel_add_speaker(&sel, speaker_pos[i].id);
-- 
cgit v1.2.3