Do not inherit "volume" where it is ignored and overriden

diff --git a/lib/media_player.c b/lib/media_player.c
index cfd9f63b8e52384c74f098ddfa896ebd9a9ea8ff..967593e11d3ed7f139b298fe27eea03ba1a105de 100644 (file)
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -465,7 +465,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      /* Audio */
     var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
     var_Create (mp, "mute", VLC_VAR_BOOL);
-    var_Create (mp, "volume", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+    var_Create (mp, "volume", VLC_VAR_INTEGER);
     var_Create (mp, "find-input-callback", VLC_VAR_ADDRESS);
     var_SetAddress (mp, "find-input-callback", find_input);
     var_Create (mp, "amem-data", VLC_VAR_ADDRESS);

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index d6c656112c1fb084ac3fddbb2174cebc91d1001a..ad3db0bb4f0416c825cfa0fc014664be7d1b09fe 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -153,10 +153,6 @@ static const char *const ppsz_snap_formats[] =
 #define GAIN_LONGTEXT N_( \
     "This linear gain will be applied to outputted audio.")
 
-#define VOLUME_TEXT N_("Default audio volume")
-#define VOLUME_LONGTEXT N_( \
-    "You can set the default audio output volume here.")
-
 #define VOLUME_STEP_TEXT N_("Audio output volume step")
 #define VOLUME_STEP_LONGTEXT N_( \
     "The step size of the volume is adjustable using this option.")
@@ -1476,9 +1472,7 @@ vlc_module_begin ()
         change_safe ()
     add_float( "gain", 1., GAIN_TEXT, GAIN_LONGTEXT, true )
         change_float_range( 0., 8. )
-    add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, 0,
-                            AOUT_VOLUME_MAX, VOLUME_TEXT,
-                            VOLUME_LONGTEXT, false )
+    add_obsolete_integer( "volume" ) /* since 2.1.0 */
     add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, 0,
                             AOUT_VOLUME_MAX, VOLUME_STEP_TEXT,
                             VOLUME_STEP_LONGTEXT, true )

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 15b0d269384301ff28ecd9b5f746e84da2ed8b45..aa418ad452877ad1ec87a9089682a16ff2f63b40 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -437,7 +437,7 @@ static void VariablesInit( playlist_t *p_playlist )
 
     /* Audio output parameters */
     var_Create( p_playlist, "mute", VLC_VAR_BOOL );
-    var_Create( p_playlist, "volume", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+    var_Create( p_playlist, "volume", VLC_VAR_INTEGER );
     /* FIXME: horrible hack for audio output interface code */
     var_Create( p_playlist, "find-input-callback", VLC_VAR_ADDRESS );
     var_SetAddress( p_playlist, "find-input-callback", playlist_FindInput );