mirror of https://code.videolan.org/videolan/vlc
Revert "input: remove unused input_resource_ResetAout() function"
This reverts commit 72d3ebd544
.
This commit is contained in:
parent
73e1c19c0f
commit
a64695dd92
|
@ -76,5 +76,10 @@ VLC_API audio_output_t *input_resource_GetAout( input_resource_t * );
|
|||
*/
|
||||
VLC_API void input_resource_PutAout( input_resource_t *, audio_output_t * );
|
||||
|
||||
/**
|
||||
* Prevents the existing audio output (if any) from being recycled.
|
||||
*/
|
||||
VLC_API void input_resource_ResetAout( input_resource_t * );
|
||||
|
||||
/** @} */
|
||||
#endif
|
||||
|
|
|
@ -320,6 +320,22 @@ audio_output_t *input_resource_HoldAout( input_resource_t *p_resource )
|
|||
return p_aout;
|
||||
}
|
||||
|
||||
void input_resource_ResetAout( input_resource_t *p_resource )
|
||||
{
|
||||
audio_output_t *p_aout = NULL;
|
||||
|
||||
vlc_mutex_lock( &p_resource->lock_hold );
|
||||
if( !p_resource->b_aout_busy )
|
||||
p_aout = p_resource->p_aout;
|
||||
|
||||
p_resource->p_aout = NULL;
|
||||
p_resource->b_aout_busy = false;
|
||||
vlc_mutex_unlock( &p_resource->lock_hold );
|
||||
|
||||
if( p_aout != NULL )
|
||||
aout_Destroy( p_aout );
|
||||
}
|
||||
|
||||
/* Common */
|
||||
input_resource_t *input_resource_New( vlc_object_t *p_parent )
|
||||
{
|
||||
|
|
|
@ -214,6 +214,7 @@ input_resource_Release
|
|||
input_resource_GetAout
|
||||
input_resource_HoldAout
|
||||
input_resource_PutAout
|
||||
input_resource_ResetAout
|
||||
vlc_readdir_helper_init
|
||||
vlc_readdir_helper_finish
|
||||
vlc_readdir_helper_additem
|
||||
|
|
Loading…
Reference in New Issue