Skip to content

V
vlc-2-2
Commit fa5495cf authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix audio outputs access aout internals directly

parent fd4a0ddc
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/audio_output/audioqueue.c
View file @ fa5495cf
...@@ -159,9 +159,9 @@ void AudioQueueCallback(void * inUserData, AudioQueueRef inAQ, AudioQueueBufferR ...@@ -159,9 +159,9 @@ void AudioQueueCallback(void * inUserData, AudioQueueRef inAQ, AudioQueueBufferR
aout_buffer_t * p_buffer = NULL; aout_buffer_t * p_buffer = NULL;
if (p_aout) { 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 ); 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 ) { if ( p_buffer != NULL ) {
......
modules/audio_output/sdl.c
View file @ fa5495cf
...@@ -251,9 +251,9 @@ static void SDLCallback( void * _p_aout, uint8_t * p_stream, int i_len ) ...@@ -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 * hardware latency, or the buffer state. So we just pop data and throw
* it at SDL's face. Nah. */ * 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 ); 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 ) if ( p_buffer != NULL )
{ {
......
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