opensles: remove obsolete code

[vlc] / modules / audio_output / audiotrack.c

diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
index 127fc32b1b61812371543071f260ea9f9655cf4f..bea55fff28ac18ca8cc36bb3cd580dbf19240f8c 100644 (file)
--- a/modules/audio_output/audiotrack.c
+++ b/modules/audio_output/audiotrack.c
@@ -91,6 +91,9 @@ typedef int (*AudioTrack_flush)(void *);
 typedef int (*AudioTrack_pause)(void *);
 
 struct aout_sys_t {
+    float soft_gain;
+    bool soft_mute;
+
     void *libmedia;
     void *AudioTrack;
 
@@ -110,11 +113,14 @@ struct aout_sys_t {
     AudioTrack_pause at_pause;
 };
 
+/* Soft volume helper */
+#include "volume.h"
+
 static void *InitLibrary(struct aout_sys_t *p_sys);
 
 static int  Open(vlc_object_t *);
 static void Close(vlc_object_t *);
-static void Play(audio_output_t*, block_t*, mtime_t* restrict);
+static void Play(audio_output_t*, block_t*);
 static void Pause (audio_output_t *, bool, mtime_t);
 
 vlc_module_begin ()
@@ -265,7 +271,10 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
         return VLC_EGENERIC;
     }
 
+    aout_SoftVolumeStart(aout);
+
     aout->sys = p_sys;
+    aout->time_get = NULL;
     aout->play = Play;
     aout->pause = Pause;
 
@@ -287,9 +296,8 @@ static void Stop(audio_output_t* p_aout)
 }
 
 /* FIXME: lipsync */
-static void Play(audio_output_t* p_aout, block_t* p_buffer, mtime_t* restrict drift)
+static void Play(audio_output_t* p_aout, block_t* p_buffer)
 {
-    VLC_UNUSED(drift);
     aout_sys_t *p_sys = p_aout->sys;
 
     size_t length = 0;
@@ -331,7 +339,7 @@ static int Open(vlc_object_t *obj)
     aout->sys = sys;
     aout->start = Start;
     aout->stop = Stop;
-    //aout_SoftVolumeInit(aout);
+    aout_SoftVolumeInit(aout);
     return VLC_SUCCESS;
 }