For consistency, remove references to vlc from libvlc

[vlc] / src / audio_output / intf.c

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 1a36db4ee313247b63311aa9fe3bfb54b1caf717..55fcec8711beb9d606e221a6931dd0adc13fa74e 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -100,7 +100,7 @@ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
     config_PutInt( p_object, "volume", i_volume );
 
     val.b_bool = VLC_TRUE;
-    var_Set( p_object->p_vlc, "volume-change", val );
+    var_Set( p_object->p_libvlc, "volume-change", val );
 
     if ( p_aout == NULL ) return 0;
 
@@ -156,7 +156,7 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
 
-    i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" );
+    i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
     i_volume = config_GetInt( p_object, "volume" );
     i_volume += i_volume_step * i_nb_steps;
     if ( i_volume > AOUT_VOLUME_MAX )
@@ -164,8 +164,8 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
         i_volume = AOUT_VOLUME_MAX;
     }
     config_PutInt( p_object, "volume", i_volume );
-    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-    var_SetInteger( p_object->p_libvlc, "saved-volume" ,
+    var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+    var_SetInteger( p_object->p_libvlc_global, "saved-volume" ,
                     (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
@@ -196,7 +196,7 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
                                                 FIND_ANYWHERE );
     int i_result = 0, i_volume = 0, i_volume_step = 0;
 
-    i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" );
+    i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
     i_volume = config_GetInt( p_object, "volume" );
     i_volume -= i_volume_step * i_nb_steps;
     if ( i_volume < AOUT_VOLUME_MIN )
@@ -204,8 +204,8 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
         i_volume = AOUT_VOLUME_MIN;
     }
     config_PutInt( p_object, "volume", i_volume );
-    var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-    var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume );
+    var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+    var_SetInteger( p_object->p_libvlc_global, "saved-volume", (audio_volume_t) i_volume );
     if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
 
     if ( p_aout == NULL ) return 0;
@@ -237,15 +237,15 @@ int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
     {
         /* Mute */
         i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
-        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-        var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume );
+        var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+        var_SetInteger( p_object->p_libvlc_global, "saved-volume", (int)i_volume );
         if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
     }
     else
     {
         /* Un-mute */
-        var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
-        i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc,
+        var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+        i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc_global,
                                                    "saved-volume" );
         i_result = aout_VolumeSet( p_object, i_volume );
         if ( pi_volume != NULL ) *pi_volume = i_volume;