vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Jul 9 13:14:15 2011 +0300| [fa5495cf0186cd8fe886bafc57582d5e5d34a5e3] | committer: Rémi Denis-Courmont
Fix audio outputs access aout internals directly > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa5495cf0186cd8fe886bafc57582d5e5d34a5e3 --- modules/audio_output/audioqueue.c | 4 ++-- modules/audio_output/sdl.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/audio_output/audioqueue.c b/modules/audio_output/audioqueue.c index 64c28c6..d3d0e0b 100644 --- a/modules/audio_output/audioqueue.c +++ b/modules/audio_output/audioqueue.c @@ -159,9 +159,9 @@ void AudioQueueCallback(void * inUserData, AudioQueueRef inAQ, AudioQueueBufferR aout_buffer_t * p_buffer = NULL; if (p_aout) { - vlc_mutex_lock( &p_aout->output_fifo_lock ); + vlc_mutex_lock( &p_aout->lock ); p_buffer = aout_FifoPop( &p_aout->output.fifo ); - vlc_mutex_unlock( &p_aout->output_fifo_lock ); + vlc_mutex_unlock( &p_aout->lock ); } if ( p_buffer != NULL ) { diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c index 3acd8cc..9151939 100644 --- a/modules/audio_output/sdl.c +++ b/modules/audio_output/sdl.c @@ -251,9 +251,9 @@ static void SDLCallback( void * _p_aout, uint8_t * p_stream, int i_len ) * hardware latency, or the buffer state. So we just pop data and throw * it at SDL's face. Nah. */ - vlc_mutex_lock( &p_aout->output_fifo_lock ); + vlc_mutex_lock( &p_aout->lock ); p_buffer = aout_FifoPop( &p_aout->output.fifo ); - vlc_mutex_unlock( &p_aout->output_fifo_lock ); + vlc_mutex_unlock( &p_aout->lock ); if ( p_buffer != NULL ) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
