Commit 79163765 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Make aout "intf-change" a void variable

parent f14ca312
...@@ -302,7 +302,7 @@ static int Probe( aout_instance_t * p_aout, ...@@ -302,7 +302,7 @@ static int Probe( aout_instance_t * p_aout,
/* Add final settings to the variable */ /* Add final settings to the variable */
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
var_SetBool( p_aout, "intf-change", true ); var_TriggerCallback( p_aout, "intf-change" );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -565,7 +565,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -565,7 +565,7 @@ static void Probe( aout_instance_t * p_aout )
} }
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
var_SetBool( p_aout, "intf-change", true ); var_TriggerCallback( p_aout, "intf-change" );
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -352,7 +352,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -352,7 +352,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
var_SetBool( p_aout, "intf-change", true ); var_TriggerCallback( p_aout, "intf-change" );
/* Reset the DSP device */ /* Reset the DSP device */
if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ) if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 )
......
...@@ -434,7 +434,7 @@ static int PAOpenDevice( aout_instance_t *p_aout ) ...@@ -434,7 +434,7 @@ static int PAOpenDevice( aout_instance_t *p_aout )
} }
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
var_SetBool( p_aout, "intf-change", true ); var_TriggerCallback( p_aout, "intf-change" );
} }
/* Audio format is paFloat32 (always supported by portaudio v19) */ /* Audio format is paFloat32 (always supported by portaudio v19) */
......
...@@ -210,7 +210,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -210,7 +210,7 @@ static int Open ( vlc_object_t *p_this )
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
} }
var_SetBool( p_aout, "intf-change", true ); var_TriggerCallback( p_aout, "intf-change" );
p_aout->output.output.i_rate = obtained.freq; p_aout->output.output.i_rate = obtained.freq;
p_aout->output.i_nb_samples = obtained.samples; p_aout->output.i_nb_samples = obtained.samples;
......
...@@ -473,7 +473,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -473,7 +473,7 @@ static void Probe( aout_instance_t * p_aout )
} }
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
var_SetBool( p_aout, "intf-change", true ); var_TriggerCallback( p_aout, "intf-change" );
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -98,8 +98,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent ) ...@@ -98,8 +98,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
p_aout->output.b_error = 1; p_aout->output.b_error = 1;
p_aout->output.b_starving = 1; p_aout->output.b_starving = 1;
var_Create( p_aout, "intf-change", VLC_VAR_BOOL ); var_Create( p_aout, "intf-change", VLC_VAR_VOID );
var_SetBool( p_aout, "intf-change", true );
vlc_object_set_destructor( p_aout, aout_Destructor ); vlc_object_set_destructor( p_aout, aout_Destructor );
......
...@@ -95,7 +95,7 @@ static int commitVolume (vlc_object_t *obj, aout_instance_t *aout, ...@@ -95,7 +95,7 @@ static int commitVolume (vlc_object_t *obj, aout_instance_t *aout,
aout_unlock_mixer (aout); aout_unlock_mixer (aout);
if (ret == 0) if (ret == 0)
var_SetBool (aout, "intf-change", true); var_TriggerCallback (aout, "intf-change");
aout_unlock_volume (aout); aout_unlock_volume (aout);
vlc_object_release (aout); vlc_object_release (aout);
} }
......
...@@ -154,7 +154,7 @@ int aout_OutputNew( aout_instance_t * p_aout, ...@@ -154,7 +154,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart, var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
NULL ); NULL );
} }
var_SetBool( p_aout, "intf-change", true ); var_TriggerCallback( p_aout, "intf-change" );
aout_FormatPrepare( &p_aout->output.output ); aout_FormatPrepare( &p_aout->output.output );
......
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