[vlc-commits] qt4: remove --qt-autosave-volume

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 17 20:13:45 2012 +0300| [636019fc5ddd5b1661685ba04968cc220ea117ed] | committer: Rémi Denis-Courmont

qt4: remove --qt-autosave-volume

Qt4 is only one of several views to the playlist.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=636019fc5ddd5b1661685ba04968cc220ea117ed
---

 modules/gui/qt4/components/simple_preferences.cpp |    2 +-
 modules/gui/qt4/input_manager.cpp                 |    3 ---
 modules/gui/qt4/qt4.cpp                           |    4 ----
 3 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index c5fdc25..c2e44ce 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -333,7 +333,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONNECT( ui.defaultVolume, valueChanged( int ),
                      this, updateAudioVolume( int ) );
 
-            CONFIG_BOOL( "qt-autosave-volume", keepVolumeRadio );
+            CONFIG_BOOL( "volume-save", keepVolumeRadio );
             ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() );
             CONNECT( ui.resetVolumeRadio, toggled( bool ),
                      ui.defaultVolume_zone, setEnabled( bool ) );
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 47f8243..28ffee5 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -982,9 +982,6 @@ MainInputManager::~MainInputManager()
     config_PutInt( p_intf, "random", var_GetBool( THEPL, "random" ) );
     config_PutInt( p_intf, "loop", var_GetBool( THEPL, "loop" ) );
     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()
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 73e84d5..1b6d548 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -125,8 +125,6 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
                             "two weeks." )
 #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 RECENTPLAY_TEXT N_( "Save the recently played items in the menu" )
@@ -245,8 +243,6 @@ vlc_module_begin ()
               UPDATER_DAYS_TEXT, UPDATER_DAYS_TEXT, false )
 #endif
 
-    add_bool( "qt-autosave-volume", true, SAVEVOL_TEXT,
-              SAVEVOL_TEXT, true )
 #ifdef WIN32
     add_bool( "qt-disable-volume-keys"             /* name */,
               true                                 /* default value */,