qtsound: unify and modernize coding style

[vlc] / modules / audio_output / audioqueue.c

diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c
index 8cc5a768afe7062b048c4b7accc6e5b9c4bfa15b..6dc8c8cae785213f27a380a84106d96894f23620 100644 (file)
--- a/modules/audio_output/audioqueue.c
+++ b/modules/audio_output/audioqueue.c
@@ -48,6 +48,8 @@ struct aout_sys_t
 {
     aout_packet_t packet;
     AudioQueueRef audioQueue;
+    float soft_gain;
+    bool soft_mute;
 };
 
 /*****************************************************************************
@@ -55,9 +57,11 @@ struct aout_sys_t
  *****************************************************************************/
 static int  Open               ( vlc_object_t * );
 static void Close              ( vlc_object_t * );
-static void Play               ( audio_output_t *, block_t * );
+static void Play               ( audio_output_t *, block_t *, mtime_t * );
 static void AudioQueueCallback (void *, AudioQueueRef, AudioQueueBufferRef);
 
+#include "volume.h"
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -117,7 +121,7 @@ static int Open ( vlc_object_t *p_this )
     }
 
     /* Volume is entirely done in software. */
-    aout_VolumeSoftInit( p_aout );
+    aout_SoftVolumeInit( p_aout );
 
     p_aout->format.i_format = VLC_CODEC_S16L;
     p_aout->format.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;