vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jul 19 21:21:59 2012 +0300| [f277d2397b3594e3864eb76266398ca4995d1929] | committer: Rémi Denis-Courmont
Do not inherit "volume" where it is ignored and overriden > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f277d2397b3594e3864eb76266398ca4995d1929 --- lib/media_player.c | 2 +- src/libvlc-module.c | 8 +------- src/playlist/engine.c | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/media_player.c b/lib/media_player.c index cfd9f63..967593e 100644 --- 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 d6c6561..ad3db0b 100644 --- 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 15b0d26..aa418ad 100644 --- 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 ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
