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

qt4: remove --qt-autosave-volume

Qt4 is only one of several views to the playlist.
parent b0fdf364
...@@ -333,7 +333,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -333,7 +333,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONNECT( ui.defaultVolume, valueChanged( int ), CONNECT( ui.defaultVolume, valueChanged( int ),
this, updateAudioVolume( int ) ); this, updateAudioVolume( int ) );
CONFIG_BOOL( "qt-autosave-volume", keepVolumeRadio ); CONFIG_BOOL( "volume-save", keepVolumeRadio );
ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() ); ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() );
CONNECT( ui.resetVolumeRadio, toggled( bool ), CONNECT( ui.resetVolumeRadio, toggled( bool ),
ui.defaultVolume_zone, setEnabled( bool ) ); ui.defaultVolume_zone, setEnabled( bool ) );
......
...@@ -982,9 +982,6 @@ MainInputManager::~MainInputManager() ...@@ -982,9 +982,6 @@ MainInputManager::~MainInputManager()
config_PutInt( p_intf, "random", var_GetBool( THEPL, "random" ) ); config_PutInt( p_intf, "random", var_GetBool( THEPL, "random" ) );
config_PutInt( p_intf, "loop", var_GetBool( THEPL, "loop" ) ); config_PutInt( p_intf, "loop", var_GetBool( THEPL, "loop" ) );
config_PutInt( p_intf, "repeat", var_GetBool( THEPL, "repeat" ) ); config_PutInt( p_intf, "repeat", var_GetBool( THEPL, "repeat" ) );
if( var_InheritBool( p_intf, "qt-autosave-volume" ) )
config_PutInt( p_intf, "volume", aout_VolumeGet( THEPL ) );
} }
vout_thread_t* MainInputManager::getVout() vout_thread_t* MainInputManager::getVout()
......
...@@ -125,8 +125,6 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); ...@@ -125,8 +125,6 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
"two weeks." ) "two weeks." )
#define UPDATER_DAYS_TEXT N_("Number of days between two update checks") #define UPDATER_DAYS_TEXT N_("Number of days between two update checks")
#define SAVEVOL_TEXT N_( "Automatically save the volume on exit" )
#define PRIVACY_TEXT N_( "Ask for network policy at start" ) #define PRIVACY_TEXT N_( "Ask for network policy at start" )
#define RECENTPLAY_TEXT N_( "Save the recently played items in the menu" ) #define RECENTPLAY_TEXT N_( "Save the recently played items in the menu" )
...@@ -245,8 +243,6 @@ vlc_module_begin () ...@@ -245,8 +243,6 @@ vlc_module_begin ()
UPDATER_DAYS_TEXT, UPDATER_DAYS_TEXT, false ) UPDATER_DAYS_TEXT, UPDATER_DAYS_TEXT, false )
#endif #endif
add_bool( "qt-autosave-volume", true, SAVEVOL_TEXT,
SAVEVOL_TEXT, true )
#ifdef WIN32 #ifdef WIN32
add_bool( "qt-disable-volume-keys" /* name */, add_bool( "qt-disable-volume-keys" /* name */,
true /* default value */, true /* default value */,
......
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