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

Timestamp:

Mar 16, 2012, 4:02:47 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: 0.7.1 trunk update

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/preferences.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -31 +31 @@
 #include <QLocale>
 
+#if QT_VERSION >= 0x040400
+#include <QDesktopServices>
+#endif
+
+#if YOUTUBE_SUPPORT
+#include "retrieveyoutubeurl.h"
+#endif
+
 using namespace Global;
 
@@ -74 +82 @@
         screenshot_directory= "./screenshots";
 #else
-        if (QFile::exists(Paths::configPath() + "/screenshots")) {
-                screenshot_directory = Paths::configPath() + "/screenshots";
+        #if QT_VERSION < 0x040400
+        QString default_screenshot_path = Paths::configPath() + "/screenshots";
+        if (QFile::exists(default_screenshot_path)) {
+                screenshot_directory = default_screenshot_path;
         }
+        #endif
 #endif
 
@@ -180 +191 @@
         cache_for_audiocds = 1000;
         cache_for_tv = 3000;
+
+#if YOUTUBE_SUPPORT
+        yt_quality = RetrieveYoutubeUrl::MP4_360p;
+#endif
 
 
@@ -325 +340 @@
         relative_seeking = false;
 #endif
+        precise_seeking = true;
 
         language = "";
@@ -422 +438 @@
         mplayer_detected_version = -1; //None version parsed yet
         mplayer_user_supplied_version = -1;
+        mplayer_is_mplayer2 = false;
+        mplayer2_detected_version = QString::null;
 
 
@@ -428 +446 @@
        ********* */
 
-#ifdef Q_OS_WIN
-        // Some people reported smplayer doesn't start with this option enabled
-        // So now it's disabled by default on Windows
-        use_single_instance = false; 
-#else
         use_single_instance = true;
-#endif
         use_autoport = true;
         connection_port = 8000;
@@ -486 +498 @@
 
         set->setValue("use_screenshot", use_screenshot);
+        #if QT_VERSION >= 0x040400
+        set->setValue("screenshot_folder", screenshot_directory);
+        #else
         set->setValue("screenshot_directory", screenshot_directory);
+        #endif
 
         set->setValue("dont_remember_media_settings", dont_remember_media_settings);
@@ -589 +605 @@
         set->setValue("cache_for_audiocds", cache_for_audiocds);
         set->setValue("cache_for_tv", cache_for_tv);
+
+#if YOUTUBE_SUPPORT
+        set->setValue("youtube_quality", yt_quality);
+#endif
 
         set->endGroup(); // performance
@@ -731 +751 @@
         set->setValue("relative_seeking", relative_seeking);
 #endif
+        set->setValue("precise_seeking", precise_seeking);
 
         set->setValue("language", language);
@@ -833 +854 @@
         set->setValue("mplayer_detected_version", mplayer_detected_version);
         set->setValue("mplayer_user_supplied_version", mplayer_user_supplied_version);
+        set->setValue("is_mplayer2", mplayer_is_mplayer2);
+        set->setValue("mplayer2_detected_version", mplayer2_detected_version);
         set->endGroup(); // mplayer_info
 
@@ -841 +864 @@
 
         set->beginGroup("instances");
-        set->setValue("use_single_instance", use_single_instance);
+        set->setValue("single_instance_enabled", use_single_instance);
         set->setValue("connection_port", connection_port);
         set->setValue("use_autoport", use_autoport);
@@ -902 +925 @@
 
         use_screenshot = set->value("use_screenshot", use_screenshot).toBool();
+        #if QT_VERSION >= 0x040400
+        screenshot_directory = set->value("screenshot_folder", screenshot_directory).toString();
+        setupScreenshotFolder();
+        #else
         screenshot_directory = set->value("screenshot_directory", screenshot_directory).toString();
+        #endif
 
         dont_remember_media_settings = set->value("dont_remember_media_settings", dont_remember_media_settings).toBool();
@@ -1006 +1034 @@
         cache_for_audiocds = set->value("cache_for_audiocds", cache_for_audiocds).toInt();
         cache_for_tv = set->value("cache_for_tv", cache_for_tv).toInt();
+
+#if YOUTUBE_SUPPORT
+        yt_quality = set->value("youtube_quality", yt_quality).toInt();
+#endif
 
         set->endGroup(); // performance
@@ -1153 +1185 @@
         relative_seeking = set->value("relative_seeking", relative_seeking).toBool();
 #endif
+        precise_seeking = set->value("precise_seeking", precise_seeking).toBool();
 
         language = set->value("language", language).toString();
@@ -1256 +1289 @@
         mplayer_detected_version = set->value("mplayer_detected_version", mplayer_detected_version).toInt();
         mplayer_user_supplied_version = set->value("mplayer_user_supplied_version", mplayer_user_supplied_version).toInt();
+        mplayer_is_mplayer2 = set->value("is_mplayer2", mplayer_is_mplayer2).toBool();
+        mplayer2_detected_version = set->value("mplayer2_detected_version", mplayer2_detected_version).toString();
+
         set->endGroup(); // mplayer_info
 
@@ -1264 +1300 @@
 
         set->beginGroup("instances");
-        use_single_instance = set->value("use_single_instance", use_single_instance).toBool();
+        use_single_instance = set->value("single_instance_enabled", use_single_instance).toBool();
         connection_port = set->value("connection_port", connection_port).toInt();
         use_autoport = set->value("use_autoport", use_autoport).toBool();
@@ -1332 +1368 @@
         }
 }
+
+void Preferences::setupScreenshotFolder() {
+#if QT_VERSION >= 0x040400
+        if (screenshot_directory.isEmpty()) {
+                QString pdir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation);
+                if (pdir.isEmpty()) pdir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+                if (pdir.isEmpty()) pdir = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
+                if (pdir.isEmpty()) pdir = "/tmp";
+                if (!QFile::exists(pdir)) {
+                        qWarning("Preferences::setupScreenshotFolder: folder '%s' does not exist. Using /tmp as fallback", pdir.toUtf8().constData());
+                        pdir = "/tmp";
+                }
+                QString default_screenshot_path = pdir + "/smplayer_screenshots";
+                if (!QFile::exists(default_screenshot_path)) {
+                        qDebug("Preferences::setupScreenshotFolder: creating '%s'", default_screenshot_path.toUtf8().constData());
+                        if (!QDir().mkdir(default_screenshot_path)) {
+                                qWarning("Preferences::setupScreenshotFolder: failed to create '%s'", default_screenshot_path.toUtf8().constData());
+                        }
+                }
+                if (QFile::exists(default_screenshot_path)) {
+                        screenshot_directory = default_screenshot_path;
+                }
+        }
+#endif
+}