Make aout "intf-change" a void variable

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 23ee8073804e48acb1b794485f72b9ae52e26eea..64e6b5d79e0e92b84173e1f9164ea6ad750c1469 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -302,7 +302,7 @@ static int Probe( aout_instance_t * p_aout,
 
     /* Add final settings to the variable */
     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;
 }
 

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 7e9694d1e293ccccada8f33d1fa81caf51232985..2897af7884e535f3863d8820a77a453392c33662 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -565,7 +565,7 @@ static void Probe( aout_instance_t * p_aout )
     }
 
     var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
-    var_SetBool( p_aout, "intf-change", true );
+    var_TriggerCallback( p_aout, "intf-change" );
 }
 
 /*****************************************************************************

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index d44ab8adc4b1a7ef8111a84646434784bbb18cff..3d9a535db2744e0478f5fdc568dece215b74d98a 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -352,7 +352,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    var_SetBool( p_aout, "intf-change", true );
+    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/portaudio.c b/modules/audio_output/portaudio.c
index 2c6a0ea1dfb0e9f2fddc5979ed853f30ad24c56f..8d9897284c9a6176103aa1767ec6f9efe1a0b040 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -434,7 +434,7 @@ static int PAOpenDevice( aout_instance_t *p_aout )
         }
 
         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) */

diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index 89bbfb1eb0d24dffa666f92b0849c89e5d75b464..a474d24e1d5f397861cbb7c50766f40b890ac035 100644 (file)
--- a/modules/audio_output/sdl.c
+++ b/modules/audio_output/sdl.c
@@ -210,7 +210,7 @@ static int Open ( vlc_object_t *p_this )
         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.i_nb_samples = obtained.samples;

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 287cb02f827e8ef83f5668358315de8ea2c0e194..36b8ae431b018326a7897e02907ea26a7272c409 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -473,7 +473,7 @@ static void Probe( aout_instance_t * p_aout )
     }
 
     var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
-    var_SetBool( p_aout, "intf-change", true );
+    var_TriggerCallback( p_aout, "intf-change" );
 }
 
 /*****************************************************************************

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 75f4c91f26aa4f2d1f42b8f81a94dbd8f97cdcbe..b073426050b5c500e7f6e144bebd9d4a535166ec 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -98,8 +98,7 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
     p_aout->output.b_error = 1;
     p_aout->output.b_starving = 1;
 
-    var_Create( p_aout, "intf-change", VLC_VAR_BOOL );
-    var_SetBool( p_aout, "intf-change", true );
+    var_Create( p_aout, "intf-change", VLC_VAR_VOID );
 
     vlc_object_set_destructor( p_aout, aout_Destructor );
 

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 8ff261e13c3688f20ae63a101e2a620f8ac21327..8265d184bdfe80b9e4380e436f7181f0cab956a5 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -95,7 +95,7 @@ static int commitVolume (vlc_object_t *obj, aout_instance_t *aout,
         aout_unlock_mixer (aout);
 
         if (ret == 0)
-            var_SetBool (aout, "intf-change", true);
+            var_TriggerCallback (aout, "intf-change");
         aout_unlock_volume (aout);
         vlc_object_release (aout);
     }

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 0642f19362fa84a47597d483312ef7a2130d35bf..a42746722e30979f749c236c1011867c453bc83e 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -154,7 +154,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
         var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
                          NULL );
     }
-    var_SetBool( p_aout, "intf-change", true );
+    var_TriggerCallback( p_aout, "intf-change" );
 
     aout_FormatPrepare( &p_aout->output.output );