Commit 909d207e authored by Jean-Paul Saman's avatar Jean-Paul Saman

auhal: cleanup

(cherry picked from commit 5c9a6eb2a1f0027dd533e4af924436c58dc13b9f)
Signed-off-by: default avatarJean-Paul Saman <jpsaman@videolan.org>
parent 4d8907a4
...@@ -904,6 +904,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -904,6 +904,7 @@ static void Close( vlc_object_t * p_this )
*****************************************************************************/ *****************************************************************************/
static void Play( aout_instance_t * p_aout ) static void Play( aout_instance_t * p_aout )
{ {
VLC_UNUSED(p_aout);
} }
...@@ -1051,7 +1052,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -1051,7 +1052,7 @@ static void Probe( aout_instance_t * p_aout )
return; return;
error: error:
msg_Warn( p_aout, "audio device already initialized" ); msg_Warn( p_aout, "audio device already in use" );
free( p_devices ); free( p_devices );
return; return;
} }
...@@ -1265,7 +1266,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str ...@@ -1265,7 +1266,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
AudioUnitRenderActionFlags *ioActionFlags, AudioUnitRenderActionFlags *ioActionFlags,
const AudioTimeStamp *inTimeStamp, const AudioTimeStamp *inTimeStamp,
unsigned int inBusNummer, unsigned int inBusNumber,
unsigned int inNumberFrames, unsigned int inNumberFrames,
AudioBufferList *ioData ) AudioBufferList *ioData )
{ {
...@@ -1276,6 +1277,10 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, ...@@ -1276,6 +1277,10 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
aout_instance_t * p_aout = (aout_instance_t *)_p_aout; aout_instance_t * p_aout = (aout_instance_t *)_p_aout;
struct aout_sys_t * p_sys = p_aout->output.p_sys; struct aout_sys_t * p_sys = p_aout->output.p_sys;
VLC_UNUSED(ioActionFlags);
VLC_UNUSED(inBusNumber);
VLC_UNUSED(inNumberFrames);
host_time.mFlags = kAudioTimeStampHostTimeValid; host_time.mFlags = kAudioTimeStampHostTimeValid;
AudioDeviceTranslateTime( p_sys->i_selected_dev, inTimeStamp, &host_time ); AudioDeviceTranslateTime( p_sys->i_selected_dev, inTimeStamp, &host_time );
...@@ -1367,6 +1372,10 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, ...@@ -1367,6 +1372,10 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
aout_instance_t * p_aout = (aout_instance_t *)threadGlobals; aout_instance_t * p_aout = (aout_instance_t *)threadGlobals;
struct aout_sys_t * p_sys = p_aout->output.p_sys; struct aout_sys_t * p_sys = p_aout->output.p_sys;
VLC_UNUSED(inDevice);
VLC_UNUSED(inInputData);
VLC_UNUSED(inInputTime);
/* Check for the difference between the Device clock and mdate */ /* Check for the difference between the Device clock and mdate */
p_sys->clock_diff = - (mtime_t) p_sys->clock_diff = - (mtime_t)
AudioConvertHostTimeToNanos( inNow->mHostTime ) / 1000; AudioConvertHostTimeToNanos( inNow->mHostTime ) / 1000;
...@@ -1431,6 +1440,9 @@ static OSStatus StreamListener( AudioStreamID inStream, ...@@ -1431,6 +1440,9 @@ static OSStatus StreamListener( AudioStreamID inStream,
{ {
OSStatus err = noErr; OSStatus err = noErr;
struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData; struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData;
VLC_UNUSED(inStream);
VLC_UNUSED(inChannel);
switch( inPropertyID ) switch( inPropertyID )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment