Commit b0fdf364 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

aout: --volume-save to retain volume, enabled by default

parent 5c524ec7
...@@ -87,6 +87,8 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout, ...@@ -87,6 +87,8 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
/* update caller (input manager) volume */ /* update caller (input manager) volume */
var_SetInteger (obj, "volume", volume); var_SetInteger (obj, "volume", volume);
var_SetBool (obj, "mute", mute); var_SetBool (obj, "mute", mute);
if (var_InheritBool (obj, "volume-save"))
config_PutInt (obj, "volume", volume);
if (aout != NULL) if (aout != NULL)
{ {
......
...@@ -277,6 +277,11 @@ static const char *const ppsz_snap_formats[] = ...@@ -277,6 +277,11 @@ static const char *const ppsz_snap_formats[] =
"in a range from 0 to 1024." ) "in a range from 0 to 1024." )
#define AOUT_VOLUME_STEP 32 #define AOUT_VOLUME_STEP 32
#define VOLUME_SAVE_TEXT N_( "Remember the audio volume" )
#define VOLUME_SAVE_LONGTEXT N_( \
"The volume can be recorded and automatically restored next time " \
"VLC is used." )
#define AOUT_RATE_TEXT N_("Audio output frequency (Hz)") #define AOUT_RATE_TEXT N_("Audio output frequency (Hz)")
#define AOUT_RATE_LONGTEXT N_( \ #define AOUT_RATE_LONGTEXT N_( \
"You can force the audio output frequency here. Common values are " \ "You can force the audio output frequency here. Common values are " \
...@@ -1591,6 +1596,7 @@ vlc_module_begin () ...@@ -1591,6 +1596,7 @@ vlc_module_begin ()
add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, 0, add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, 0,
AOUT_VOLUME_MAX, VOLUME_STEP_TEXT, AOUT_VOLUME_MAX, VOLUME_STEP_TEXT,
VOLUME_STEP_LONGTEXT, true ) VOLUME_STEP_LONGTEXT, true )
add_bool( "volume-save", true, VOLUME_SAVE_TEXT, VOLUME_SAVE_TEXT, true )
add_obsolete_integer( "aout-rate" ) /* since 2.0.0 */ add_obsolete_integer( "aout-rate" ) /* since 2.0.0 */
#if HAVE_FPU && !defined( __APPLE__ ) #if HAVE_FPU && !defined( __APPLE__ )
add_bool( "hq-resampling", 1, AOUT_RESAMP_TEXT, add_bool( "hq-resampling", 1, AOUT_RESAMP_TEXT,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment