[vlc-commits] aout: remove emitted but never subscribed intf-change variable

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 31 22:12:30 2012 +0300| [0c097799b52fabba35798ad4184d3f61e31ec9a1] | committer: Rémi Denis-Courmont

aout: remove emitted but never subscribed intf-change variable

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c097799b52fabba35798ad4184d3f61e31ec9a1
---

 modules/audio_output/alsa.c    |    1 -
 modules/audio_output/directx.c |    1 -
 modules/audio_output/kai.c     |    2 --
 modules/audio_output/oss.c     |    2 --
 modules/audio_output/waveout.c |    1 -
 src/audio_output/common.c      |    1 -
 src/audio_output/intf.c        |    2 --
 src/audio_output/output.c      |    2 --
 8 files changed, 12 deletions(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 206b24b..266dbe9 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -158,7 +158,6 @@ static void Probe (vlc_object_t *obj, const char *dev)
     GetDevices (obj, NULL, dev);
 
     var_AddCallback (obj, "audio-device", aout_ChannelsRestart, NULL);
-    var_TriggerCallback (obj, "intf-change");
 }
 
 
diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 97df5ff..1c9b82d 100644
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -551,7 +551,6 @@ static void Probe( audio_output_t * p_aout )
     }
 
     var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
-    var_TriggerCallback( p_aout, "intf-change" );
 }
 
 /*****************************************************************************
diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c
index aae1b84..53cbc13 100644
--- a/modules/audio_output/kai.c
+++ b/modules/audio_output/kai.c
@@ -233,8 +233,6 @@ static int Open ( vlc_object_t *p_this )
         var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
     }
 
-    var_TriggerCallback( p_aout, "intf-change" );
-
     /* Prevent SIG_FPE */
     _control87(MCW_EM, MCW_EM);
 
diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index b646809..c2bcce2 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -344,8 +344,6 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
-    var_TriggerCallback( p_aout, "intf-change" );
-
     /* Reset the DSP device */
     if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 )
     {
diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 1f3f3e9..97f2919 100644
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -465,7 +465,6 @@ static void Probe( audio_output_t * p_aout )
     }
 
     var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
-    var_TriggerCallback( p_aout, "intf-change" );
 }
 
 /*****************************************************************************
diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 17504a9..3e728eb 100644
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -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, "mute", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
-    var_Create (aout, "intf-change", VLC_VAR_VOID);
 
     /* Visualizations */
     var_Create (aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE);
diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index b905b90..b5055e0 100644
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -105,8 +105,6 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
         var_SetBool (aout, "mute", mute);
         aout_unlock_volume (aout);
 
-        if (ret == 0)
-            var_TriggerCallback (aout, "intf-change");
         vlc_object_release (aout);
     }
     return ret;
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index df3f858..dc7ed4d 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -153,7 +153,6 @@ int aout_OutputNew( audio_output_t *p_aout,
         var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
                          NULL );
     }
-    var_TriggerCallback( p_aout, "intf-change" );
 
     aout_FormatPrepare( &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)
      * output plug-in (it would cause a lock inversion). */
     var_SetInteger (aout, "volume", vol);
     var_SetBool (aout, "mute", mute);
-    var_TriggerCallback (aout, "intf-change");
 }