Changeset 135 for smplayer/trunk/src/preferences.cpp

Timestamp:

Oct 24, 2012, 8:25:23 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMplayer: update trunk to 0.8.1

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/preferences.cpp (modified) (14 diffs)

smplayer/trunk/src/preferences.cpp

@@ -39 +39 @@
 #endif
 
+#define CURRENT_CONFIG_VERSION 1
+
 using namespace Global;
 
@@ -67 +69 @@
        General
        ******* */
+
+        config_version = CURRENT_CONFIG_VERSION;
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -194 +198 @@
 #ifdef YOUTUBE_SUPPORT
         yt_quality = RetrieveYoutubeUrl::MP4_720p;
+        yt_user_agent = QString::null;
 #endif
 
@@ -384 +389 @@
         add_to_playlist_consecutive_files = false;
 
+#if LOGO_ANIMATION
+        animated_logo = true;
+#endif
+
 
     /* ********
@@ -401 +410 @@
         latest_dir = QDir::homePath();
         last_dvd_directory="";
-
+        save_dirs = true;
 
     /* **************
@@ -492 +501 @@
         set->beginGroup( "general");
 
+        set->setValue("config_version", config_version);
+
         set->setValue("mplayer_bin", mplayer_bin);
         set->setValue("driver/vo", vo);
@@ -605 +616 @@
         set->setValue("cache_for_tv", cache_for_tv);
 
+        set->endGroup(); // performance
+
 #ifdef YOUTUBE_SUPPORT
-        set->setValue("youtube_quality", yt_quality);
-#endif
-
-        set->endGroup(); // performance
+        set->beginGroup("youtube");
+        set->setValue("quality", yt_quality);
+        set->setValue("user_agent", yt_user_agent);
+        set->endGroup();
+#endif
 
 
@@ -786 +800 @@
 #endif
 
-    set->setValue("auto_add_to_playlist", auto_add_to_playlist);
-    set->setValue("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files);
+        set->setValue("auto_add_to_playlist", auto_add_to_playlist);
+        set->setValue("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files);
+
+#if LOGO_ANIMATION
+        set->setValue("animated_logo", animated_logo);
+#endif
 
         set->endGroup(); // gui
@@ -808 +826 @@
 
         set->beginGroup( "directories");
-        set->setValue("latest_dir", latest_dir);
-        set->setValue("last_dvd_directory", last_dvd_directory);
+        if (save_dirs) {
+                set->setValue("latest_dir", latest_dir);
+                set->setValue("last_dvd_directory", last_dvd_directory);
+        } else {
+                set->setValue("latest_dir", "");
+                set->setValue("last_dvd_directory", "");
+        }
+        set->setValue("save_dirs", save_dirs);
         set->endGroup(); // directories
 
@@ -918 +942 @@
         set->beginGroup( "general");
 
+        config_version = set->value("config_version", 0).toInt();
+
         mplayer_bin = set->value("mplayer_bin", mplayer_bin).toString();
         vo = set->value("driver/vo", vo).toString();
@@ -1033 +1059 @@
         cache_for_tv = set->value("cache_for_tv", cache_for_tv).toInt();
 
+        set->endGroup(); // performance
+
 #ifdef YOUTUBE_SUPPORT
-        yt_quality = set->value("youtube_quality", yt_quality).toInt();
-#endif
-
-        set->endGroup(); // performance
+        set->beginGroup("youtube");
+        yt_quality = set->value("quality", yt_quality).toInt();
+        yt_user_agent = set->value("user_agent", yt_user_agent).toString();
+        set->endGroup();
+#endif
 
 
@@ -1222 +1251 @@
         add_to_playlist_consecutive_files = set->value("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files).toBool();
 
+#if LOGO_ANIMATION
+        animated_logo = set->value("animated_logo", animated_logo).toBool();
+#endif
+
         set->endGroup(); // gui
 
@@ -1242 +1275 @@
 
         set->beginGroup( "directories");
-        latest_dir = set->value("latest_dir", latest_dir).toString();
-        last_dvd_directory = set->value("last_dvd_directory", last_dvd_directory).toString();
+        save_dirs = set->value("save_dirs", save_dirs).toBool();
+        if (save_dirs) {
+                latest_dir = set->value("latest_dir", latest_dir).toString();
+                last_dvd_directory = set->value("last_dvd_directory", last_dvd_directory).toString();
+        }
         set->endGroup(); // directories
 
@@ -1339 +1375 @@
 
         filters->load(set);
+
+        // Fix some values if config is old
+        if (config_version < CURRENT_CONFIG_VERSION) {
+                qDebug("Preferences::load: config version is old, updating it");
+                config_version = CURRENT_CONFIG_VERSION;
+                /*
+                iconset = "Nuvola";
+                yt_user_agent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)";
+                */
+        }
 }