Changeset 175 for smplayer/vendor/current/src/preferences.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (10 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/preferences.cpp (modified) (55 diffs)

smplayer/vendor/current/src/preferences.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 #include "filters.h"
 #include "autohidewidget.h"
+
 
 #include <QSettings>
@@ -31 +32 @@
 #include <QDir>
 #include <QLocale>
+
 
 #if QT_VERSION >= 0x050000
@@ -87 +89 @@
 
         use_screenshot = true;
+
+
+
+
         screenshot_directory="";
 #ifdef PORTABLE_APP
@@ -99 +105 @@
 #endif
 
+
+
+
+
         dont_remember_media_settings = false;
         dont_remember_time_pos = false;
@@ -133 +143 @@
 #endif
 
+
+
+
         use_soft_vol = true;
+
         softvol_max = 110; // 110 = default value in mplayer
         use_scaletempo = Detect;
@@ -156 +170 @@
 
         osd = None;
+
+
         osd_delay = 2200;
 
@@ -199 +215 @@
         HD_height = 720;
 
+
         // MPlayer 1.0rc1 require restart, new versions don't
         fast_audio_change = Detect;
+
+
 #if !SMART_DVD_CHAPTERS
         fast_chapter_change = false;
@@ -206 +225 @@
 
         threads = 1;
+
 
         cache_for_files = 2048;
@@ -214 +234 @@
         cache_for_tv = 3000;
 
-#ifdef YOUTUBE_SUPPORT
-        yt_quality = RetrieveYoutubeUrl::MP4_720p;
-        //yt_user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1";
-        yt_user_agent = "";
-        yt_use_https_main = false;
-        yt_use_https_vi = false;
-#endif
-
 
     /* *********
@@ -227 +239 @@
        ********* */
 
-        font_file = "";
-        font_name = "";
-        use_fontconfig = false;
         subcp = "ISO-8859-1";
         use_enca = false;
         enca_lang = QString(QLocale::system().name()).section("_",0,0);
-        font_autoscale = 1;
         subfuzziness = 1;
         autoload_sub = true;
 
         use_ass_subtitles = true;
+
         ass_line_spacing = 0;
 
@@ -246 +255 @@
         subtitles_on_screenshots = false;
 
-        use_new_sub_commands = Detect;
         change_sub_scale_should_restart = Detect;
 
@@ -259 +267 @@
 
         freetype_support = true;
-#ifdef Q_OS_WIN
+#ifdef 
         use_windowsfontdir = false;
 #endif
@@ -284 +292 @@
 
         mplayer_additional_options="";
-        #ifdef PORTABLE_APP
+        #if
         mplayer_additional_options="-nofontconfig";
         #endif
@@ -313 +321 @@
         use_edl_files = true;
 
+
+
+
+
         prefer_ipv4 = true;
 
@@ -328 +340 @@
 
         time_to_kill_mplayer = 1000;
+
+
+
+
 
 
@@ -346 +362 @@
 #endif
 
-        move_when_dragging = false;
-
+         = false;
+        center_window_if_outside = true;
 
 #if DVDNAV_SUPPORT
@@ -363 +379 @@
         wheel_function_seeking_reverse = false;
 
+
+
         seeking1 = 10;
         seeking2 = 60;
@@ -404 +422 @@
         allow_video_movement = false;
 
-#ifdef SKINS
-        gui = "SkinGUI";
-        iconset = "Gonzo";
-#else
         gui = "DefaultGUI";
-        iconset = "";
-#endif
+        iconset = "";
+
 
 #if USE_MINIMUMSIZE
@@ -443 +457 @@
         last_dvb_channel = "";
         last_tv_channel = "";
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -489 +529 @@
         mplayer_detected_version = -1; //None version parsed yet
         mplayer_user_supplied_version = -1;
+
         mplayer_is_mplayer2 = false;
         mplayer2_detected_version = QString::null;
+
 
 
@@ -561 +603 @@
 
         set->setValue("use_screenshot", use_screenshot);
+
+
+
+
         #if QT_VERSION >= 0x040400
         set->setValue("screenshot_folder", screenshot_directory);
         #else
         set->setValue("screenshot_directory", screenshot_directory);
+
+
+
+
         #endif
 
@@ -623 +673 @@
 
         set->setValue("osd", osd);
+
+
         set->setValue("osd_delay", osd_delay);
 
@@ -668 +720 @@
         set->setValue("HD_height", HD_height);
 
+
         set->setValue("fast_audio_change", fast_audio_change);
+
+
 #if !SMART_DVD_CHAPTERS
         set->setValue("fast_chapter_change", fast_chapter_change);
@@ -674 +729 @@
 
         set->setValue("threads", threads);
+
 
         set->setValue("cache_for_files", cache_for_files);
@@ -684 +740 @@
         set->endGroup(); // performance
 
-#ifdef YOUTUBE_SUPPORT
-        set->beginGroup("youtube");
-        set->setValue("quality", yt_quality);
-        set->setValue("user_agent", yt_user_agent);
-        set->setValue("yt_use_https_main", yt_use_https_main);
-        set->setValue("yt_use_https_vi", yt_use_https_vi);
-        set->endGroup();
-#endif
-
 
     /* *********
@@ -700 +747 @@
         set->beginGroup("subtitles");
 
-        set->setValue("font_file", font_file);
-        set->setValue("font_name", font_name);
-
-        set->setValue("use_fontconfig", use_fontconfig);
         set->setValue("subcp", subcp);
         set->setValue("use_enca", use_enca);
         set->setValue("enca_lang", enca_lang);
-        set->setValue("font_autoscale", font_autoscale);
         set->setValue("subfuzziness", subfuzziness);
         set->setValue("autoload_sub", autoload_sub);
 
         set->setValue("use_ass_subtitles", use_ass_subtitles);
+
         set->setValue("ass_line_spacing", ass_line_spacing);
         set->setValue("use_forced_subs_only", use_forced_subs_only);
@@ -719 +762 @@
         set->setValue("subtitles_on_screenshots", subtitles_on_screenshots);
 
-        set->setValue("use_new_sub_commands", use_new_sub_commands);
         set->setValue("change_sub_scale_should_restart", change_sub_scale_should_restart);
 
@@ -730 +772 @@
 
         set->setValue("freetype_support", freetype_support);
-#ifdef Q_OS_WIN
+#ifdef 
         set->setValue("use_windowsfontdir", use_windowsfontdir);
 #endif
@@ -780 +822 @@
         set->setValue("use_edl_files", use_edl_files);
 
+
+
+
+
         set->setValue("prefer_ipv4", prefer_ipv4);
 
@@ -795 +841 @@
 
         set->setValue("time_to_kill_mplayer", time_to_kill_mplayer);
+
+
+
+
 
         set->endGroup(); // advanced
@@ -817 +867 @@
 #endif
 
-        set->setValue("move_when_dragging", move_when_dragging);
+        set->setValue("center_window", center_window);
+        set->setValue("center_window_if_outside", center_window_if_outside);
 
         set->setValue("mouse_left_click_function", mouse_left_click_function);
@@ -829 +880 @@
         set->setValue("wheel_function_seeking_reverse", wheel_function_seeking_reverse);
 
+
+
         set->setValue("seeking1", seeking1);
         set->setValue("seeking2", seeking2);
@@ -903 +956 @@
         set->setValue("last_tv_channel", last_tv_channel);
         set->endGroup(); // tv
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     /* ***********
@@ -961 +1042 @@
         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
 
@@ -1054 +1137 @@
 
         use_screenshot = set->value("use_screenshot", use_screenshot).toBool();
+
+
+
+
         #if QT_VERSION >= 0x040400
         screenshot_directory = set->value("screenshot_folder", screenshot_directory).toString();
@@ -1059 +1146 @@
         #else
         screenshot_directory = set->value("screenshot_directory", screenshot_directory).toString();
+
+
+
+
         #endif
 
@@ -1118 +1209 @@
 
         osd = set->value("osd", osd).toInt();
+
+
         osd_delay = set->value("osd_delay", osd_delay).toInt();
 
@@ -1163 +1256 @@
         HD_height = set->value("HD_height", HD_height).toInt();
 
+
         fast_audio_change = (OptionState) set->value("fast_audio_change", fast_audio_change).toInt();
+
+
 #if !SMART_DVD_CHAPTERS
         fast_chapter_change = set->value("fast_chapter_change", fast_chapter_change).toBool();
@@ -1169 +1265 @@
 
         threads = set->value("threads", threads).toInt();
+
 
         cache_for_files = set->value("cache_for_files", cache_for_files).toInt();
@@ -1179 +1276 @@
         set->endGroup(); // performance
 
-#ifdef YOUTUBE_SUPPORT
-        set->beginGroup("youtube");
-        yt_quality = set->value("quality", yt_quality).toInt();
-        yt_user_agent = set->value("user_agent", yt_user_agent).toString();
-        yt_use_https_main = set->value("yt_use_https_main", yt_use_https_main).toBool();
-        yt_use_https_vi = set->value("yt_use_https_vi", yt_use_https_vi).toBool();
-        set->endGroup();
-#endif
-
 
     /* *********
@@ -1195 +1283 @@
         set->beginGroup("subtitles");
 
-        font_file = set->value("font_file", font_file).toString();
-        font_name = set->value("font_name", font_name).toString();
-
-        use_fontconfig = set->value("use_fontconfig", use_fontconfig).toBool();
         subcp = set->value("subcp", subcp).toString();
         use_enca = set->value("use_enca", use_enca).toBool();
         enca_lang = set->value("enca_lang", enca_lang).toString();
-        font_autoscale = set->value("font_autoscale", font_autoscale).toInt();
         subfuzziness = set->value("subfuzziness", subfuzziness).toInt();
         autoload_sub = set->value("autoload_sub", autoload_sub).toBool();
 
         use_ass_subtitles = set->value("use_ass_subtitles", use_ass_subtitles).toBool();
+
         ass_line_spacing = set->value("ass_line_spacing", ass_line_spacing).toInt();
 
@@ -1215 +1299 @@
         subtitles_on_screenshots = set->value("subtitles_on_screenshots", subtitles_on_screenshots).toBool();
 
-        use_new_sub_commands = (OptionState) set->value("use_new_sub_commands", use_new_sub_commands).toInt();
         change_sub_scale_should_restart = (OptionState) set->value("change_sub_scale_should_restart", change_sub_scale_should_restart).toInt();
 
@@ -1226 +1309 @@
 
         freetype_support = set->value("freetype_support", freetype_support).toBool();
-#ifdef Q_OS_WIN
+#ifdef 
         use_windowsfontdir = set->value("use_windowsfontdir", use_windowsfontdir).toBool();
 #endif
@@ -1281 +1364 @@
         use_edl_files = set->value("use_edl_files", use_edl_files).toBool();
 
+
+
+
+
         prefer_ipv4 = set->value("prefer_ipv4", prefer_ipv4).toBool();
 
@@ -1294 +1381 @@
 
         time_to_kill_mplayer = set->value("time_to_kill_mplayer", time_to_kill_mplayer).toInt();
+
+
+
+
 
         set->endGroup(); // advanced
@@ -1316 +1407 @@
 #endif
 
-        move_when_dragging = set->value("move_when_dragging", move_when_dragging).toBool();
+        center_window = set->value("center_window", center_window).toBool();
+        center_window_if_outside = set->value("center_window_if_outside", center_window_if_outside).toBool();
 
         mouse_left_click_function = set->value("mouse_left_click_function", mouse_left_click_function).toString();
@@ -1331 +1423 @@
         wheel_function_seeking_reverse = set->value("wheel_function_seeking_reverse", wheel_function_seeking_reverse).toBool();
 
+
+
         seeking1 = set->value("seeking1", seeking1).toInt();
         seeking2 = set->value("seeking2", seeking2).toInt();
@@ -1405 +1499 @@
         last_tv_channel = set->value("last_tv_channel", last_tv_channel).toString();
         set->endGroup(); // tv
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -1461 +1582 @@
         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();
-
+#endif
         set->endGroup(); // mplayer_info
 
@@ -1517 +1639 @@
        ********* */
 
+
 #ifdef CHECK_UPGRADED
-        set->beginGroup("smplayer");
         smplayer_stable_version = set->value("stable_version", smplayer_stable_version).toString();
         check_if_upgraded = set->value("check_if_upgraded", check_if_upgraded).toBool();
@@ -1562 +1684 @@
 
                         resize_method = Never;
-                        move_when_dragging = false;
+                        move_when_dragging = false;
                 }
                 config_version = CURRENT_CONFIG_VERSION;
@@ -1570 +1692 @@
         // Check if the mplayer binary exists and try to fix it
         if (!QFile::exists(mplayer_bin)) {
-                qWarning("mplayer_bin '%s' doesn' exist", mplayer_bin.toLatin1().constData());
+                qWarning("mplayer_bin '%s' doesn' exist", mplayer_bin.toLatin1().constData());
                 bool fixed = false;
                 if (QFile::exists("mplayer/mplayer.exe")) {
                         mplayer_bin = "mplayer/mplayer.exe";
                         fixed = true;
-                } else
+                }
+                else
                 if (QFile::exists("mplayer/mplayer2.exe")) {
                         mplayer_bin = "mplayer/mplayer2.exe";
                         fixed = true;
                 }
+
+
+
+
+
                 if (fixed) {
                         qWarning("mplayer_bin changed to '%s'", mplayer_bin.toLatin1().constData());
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 }
         }
@@ -1629 +1777 @@
                         pdir = "/tmp";
                 }
-                QString default_screenshot_path = pdir + "/smplayer_screenshots";
+                QString default_screenshot_path = ;
                 if (!QFile::exists(default_screenshot_path)) {
                         qDebug("Preferences::setupScreenshotFolder: creating '%s'", default_screenshot_path.toUtf8().constData());
@@ -1640 +1788 @@
                 }
         }
+
+
+
 #endif
 }