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

aout: remove emitted but never subscribed intf-change variable

parent a5c381a2
...@@ -158,7 +158,6 @@ static void Probe (vlc_object_t *obj, const char *dev) ...@@ -158,7 +158,6 @@ static void Probe (vlc_object_t *obj, const char *dev)
GetDevices (obj, NULL, dev); GetDevices (obj, NULL, dev);
var_AddCallback (obj, "audio-device", aout_ChannelsRestart, NULL); var_AddCallback (obj, "audio-device", aout_ChannelsRestart, NULL);
var_TriggerCallback (obj, "intf-change");
} }
......
...@@ -551,7 +551,6 @@ static void Probe( audio_output_t * p_aout ) ...@@ -551,7 +551,6 @@ static void Probe( audio_output_t * p_aout )
} }
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
var_TriggerCallback( p_aout, "intf-change" );
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -233,8 +233,6 @@ static int Open ( vlc_object_t *p_this ) ...@@ -233,8 +233,6 @@ 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_TriggerCallback( p_aout, "intf-change" );
/* Prevent SIG_FPE */ /* Prevent SIG_FPE */
_control87(MCW_EM, MCW_EM); _control87(MCW_EM, MCW_EM);
......
...@@ -344,8 +344,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -344,8 +344,6 @@ static int Open( vlc_object_t *p_this )
goto error; goto error;
} }
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 )
{ {
......
...@@ -465,7 +465,6 @@ static void Probe( audio_output_t * p_aout ) ...@@ -465,7 +465,6 @@ static void Probe( audio_output_t * p_aout )
} }
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
var_TriggerCallback( p_aout, "intf-change" );
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -77,7 +77,6 @@ audio_output_t *aout_New( vlc_object_t * p_parent ) ...@@ -77,7 +77,6 @@ audio_output_t *aout_New( vlc_object_t * p_parent )
var_Create (aout, "volume", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); var_Create (aout, "volume", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Create (aout, "mute", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); var_Create (aout, "mute", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
var_Create (aout, "intf-change", VLC_VAR_VOID);
/* Visualizations */ /* Visualizations */
var_Create (aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE); var_Create (aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE);
......
...@@ -105,8 +105,6 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout, ...@@ -105,8 +105,6 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
var_SetBool (aout, "mute", mute); var_SetBool (aout, "mute", mute);
aout_unlock_volume (aout); aout_unlock_volume (aout);
if (ret == 0)
var_TriggerCallback (aout, "intf-change");
vlc_object_release (aout); vlc_object_release (aout);
} }
return ret; return ret;
......
...@@ -153,7 +153,6 @@ int aout_OutputNew( audio_output_t *p_aout, ...@@ -153,7 +153,6 @@ int aout_OutputNew( audio_output_t *p_aout,
var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart, var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
NULL ); NULL );
} }
var_TriggerCallback( p_aout, "intf-change" );
aout_FormatPrepare( &p_aout->format ); aout_FormatPrepare( &p_aout->format );
aout_FormatPrint( p_aout, "output", &p_aout->format ); aout_FormatPrint( p_aout, "output", &p_aout->format );
...@@ -347,5 +346,4 @@ void aout_VolumeHardSet (audio_output_t *aout, float volume, bool mute) ...@@ -347,5 +346,4 @@ void aout_VolumeHardSet (audio_output_t *aout, float volume, bool mute)
* output plug-in (it would cause a lock inversion). */ * output plug-in (it would cause a lock inversion). */
var_SetInteger (aout, "volume", vol); var_SetInteger (aout, "volume", vol);
var_SetBool (aout, "mute", mute); var_SetBool (aout, "mute", mute);
var_TriggerCallback (aout, "intf-change");
} }
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