Skip to content

V
vlc-2-2
Commit b192dc3c authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

opensles: remove useless checks 

those objects are guaranteed to exist
parent a9112101
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
modules/audio_output/opensles_android.c
View file @ b192dc3c
...@@ -113,18 +113,14 @@ static void Clear( aout_sys_t *p_sys ) ...@@ -113,18 +113,14 @@ static void Clear( aout_sys_t *p_sys )
{ {
// Destroy buffer queue audio player object // Destroy buffer queue audio player object
// and invalidate all associated interfaces // and invalidate all associated interfaces
if( p_sys->playerObject != NULL )
(*p_sys->playerObject)->Destroy( p_sys->playerObject ); (*p_sys->playerObject)->Destroy( p_sys->playerObject );
// destroy output mix object, and invalidate all associated interfaces // destroy output mix object, and invalidate all associated interfaces
if( p_sys->outputMixObject != NULL )
(*p_sys->outputMixObject)->Destroy( p_sys->outputMixObject ); (*p_sys->outputMixObject)->Destroy( p_sys->outputMixObject );
// destroy engine object, and invalidate all associated interfaces // destroy engine object, and invalidate all associated interfaces
if( p_sys->engineObject != NULL )
(*p_sys->engineObject)->Destroy( p_sys->engineObject ); (*p_sys->engineObject)->Destroy( p_sys->engineObject );
if( p_sys->p_so_handle != NULL )
dlclose( p_sys->p_so_handle ); dlclose( p_sys->p_so_handle );
free( p_sys ); free( p_sys );
...@@ -276,7 +272,6 @@ static void Close( vlc_object_t *p_this ) ...@@ -276,7 +272,6 @@ static void Close( vlc_object_t *p_this )
(*p_sys->playerPlay)->SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_STOPPED ); (*p_sys->playerPlay)->SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_STOPPED );
//Flush remaining buffers if any. //Flush remaining buffers if any.
if( p_sys->playerBufferQueue != NULL )
(*p_sys->playerBufferQueue)->Clear( p_sys->playerBufferQueue ); (*p_sys->playerBufferQueue)->Clear( p_sys->playerBufferQueue );
Clear( p_sys ); Clear( p_sys );
} }
......
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