No need to check for the existence of the variable to destroy it.

[vlc] / src / audio_output / intf.c

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 3e652f3caa19c4377123d827d043835766035d1a..db9d64a219c0facdf27b230e3360151fd6782a2a 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -98,14 +98,11 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
  *****************************************************************************/
 int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
 {
-    vlc_value_t val;
     aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE );
     int i_result = 0;
 
     config_PutInt( p_object, "volume", i_volume );
-
-    val.b_bool = true;
-    var_Set( p_object->p_libvlc, "volume-change", val );
+    var_SetBool( p_object->p_libvlc, "volume-change", true );
 
     if ( p_aout == NULL ) return 0;
 
@@ -116,7 +113,7 @@ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
     }
     aout_unlock_mixer( p_aout );
 
-    var_Set( p_aout, "intf-change", val );
+    var_SetBool( p_aout, "intf-change", true );
     vlc_object_release( p_aout );
     return i_result;
 }
@@ -157,7 +154,6 @@ int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft )
 int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
                    audio_volume_t * pi_volume )
 {
-    vlc_value_t val;
     aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
@@ -175,8 +171,7 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
                     (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
-    val.b_bool = true;
-    var_Set( p_object->p_libvlc, "volume-change", val );
+    var_SetBool( p_object->p_libvlc, "volume-change", true );
 
     if ( p_aout == NULL ) return 0;
 
@@ -201,7 +196,6 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
 int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
                      audio_volume_t * pi_volume )
 {
-    vlc_value_t val;
     aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
@@ -218,8 +212,7 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
     var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
-    val.b_bool = true;
-    var_Set( p_object->p_libvlc, "volume-change", val );
+    var_SetBool( p_object->p_libvlc, "volume-change", true );
 
     if ( p_aout == NULL ) return 0;
 
@@ -235,12 +228,12 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
 }
 
 /*****************************************************************************
- * aout_VolumeMute : Mute/un-mute the output volume
+ * aout_ToggleMute : Mute/un-mute the output volume
  *****************************************************************************
  * If pi_volume != NULL, *pi_volume will contain the volume at the end of the
  * function (muted => 0).
  *****************************************************************************/
-int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
+int __aout_ToggleMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
 {
     int i_result;
     audio_volume_t i_volume;
@@ -420,7 +413,7 @@ static int aout_Restart( aout_instance_t * p_aout )
     for ( i = 0; i < p_aout->i_nb_inputs; i++ )
     {
         aout_input_t * p_input = p_aout->pp_inputs[i];
-        b_error |= aout_InputNew( p_aout, p_input );
+        b_error |= aout_InputNew( p_aout, p_input, &p_input->request_vout );
         p_input->b_changed = 1;
         aout_unlock_input( p_aout, p_input );
     }
@@ -447,14 +440,8 @@ int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
     (void)psz_name; (void)oldval; (void)newval; (void)p_data;
     if ( p_aout == NULL ) return VLC_SUCCESS;
 
-    if ( var_Type( p_aout, "audio-device" ) != 0 )
-    {
-        var_Destroy( p_aout, "audio-device" );
-    }
-    if ( var_Type( p_aout, "audio-channels" ) != 0 )
-    {
-        var_Destroy( p_aout, "audio-channels" );
-    }
+    var_Destroy( p_aout, "audio-device" );
+    var_Destroy( p_aout, "audio-channels" );
 
     aout_Restart( p_aout );
     vlc_object_release( p_aout );
@@ -476,15 +463,13 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
     {
         /* This is supposed to be a significant change and supposes
          * rebuilding the channel choices. */
-        if ( var_Type( p_aout, "audio-channels" ) >= 0 )
-        {
-            var_Destroy( p_aout, "audio-channels" );
-        }
+        var_Destroy( p_aout, "audio-channels" );
     }
     aout_Restart( p_aout );
     return 0;
 }
 
+#undef aout_EnableFilter
 /** Enable or disable an audio filter
  * \param p_this a vlc object
  * \param psz_name name of the filter
@@ -505,15 +490,3 @@ void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
     if( p_aout )
         vlc_object_release( p_aout );
 }
-
-/**
- * Change audio visualization
- * -1 goes backwards, +1 goes forward
- */
-char *aout_VisualChange( vlc_object_t *p_this, int i_skip )
-{
-    (void)p_this; (void)i_skip;
-    msg_Err( p_this, "FIXME: %s (%s %d) isn't implemented.", __func__,
-             __FILE__, __LINE__ );
-    return strdup("foobar");
-}