Fixed invalid locking order when activating visualization.

[vlc] / src / audio_output / aout_internal.h

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 6ef8da46cd339d4ee01e0469165abbd0bdaacca1..17231fcd9bcb80a7ca11c4121a892eb5d253952d 100644 (file)
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -108,6 +108,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
 int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input );
 int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
                     aout_buffer_t * p_buffer, int i_input_rate );
+void aout_InputCheckAndRestart( aout_instance_t * p_aout, aout_input_t * p_input );
 
 /* From filters.c : */
 int aout_FiltersCreatePipeline ( aout_instance_t * p_aout, filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format );
@@ -269,7 +270,10 @@ static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t
     if( p_aout )
         psz_val = var_GetString( p_aout, psz_variable );
     else
-        psz_val = config_GetPsz( p_obj, "audio-filter" );
+    {
+        psz_val = var_CreateGetString( p_obj->p_libvlc, "audio-filter" );
+        var_Destroy( p_obj->p_libvlc, "audio-filter" );
+    }
 
     if( !psz_val )
         psz_val = strdup( "" );