Imported Upstream version 16.4.0~ds0

1 files changed, 66 insertions, 56 deletions

diff --git a/src/preferences.cpp b/src/preferences.cpp
index f026bef..cb0fbad 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -214,8 +214,11 @@ void Preferences::reset() {
 	h264_skip_loop_filter = LoopEnabled;
 	HD_height = 720;
 
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
 	// MPlayer 1.0rc1 require restart, new versions don't
 	fast_audio_change = Detect;
+#endif
+
 #if !SMART_DVD_CHAPTERS
 	fast_chapter_change = false;
 #endif
@@ -230,18 +233,6 @@ void Preferences::reset() {
 	cache_for_audiocds = 1024;
 	cache_for_tv = 3000;
 
-#ifdef YOUTUBE_SUPPORT
-	enable_yt_support = true;
-	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
-#ifdef MPV_SUPPORT
-	enable_streaming_sites = false;
-#endif
-
 
     /* *********
        Subtitles
@@ -275,7 +266,7 @@ void Preferences::reset() {
 	user_forced_ass_style.clear();
 
 	freetype_support = true;
-#ifdef Q_OS_WIN
+#ifdef FONTS_HACK
 	use_windowsfontdir = false;
 #endif
 
@@ -300,7 +291,7 @@ void Preferences::reset() {
 	use_lavf_demuxer = false;
 
 	mplayer_additional_options="";
-	#ifdef PORTABLE_APP
+	#if defined(PORTABLE_APP) && defined(FONTS_HACK)
 	mplayer_additional_options="-nofontconfig";
 	#endif
     mplayer_additional_video_filters="";
@@ -370,11 +361,9 @@ void Preferences::reset() {
 	style="";
 #endif
 
-	move_when_dragging = true;
 	center_window = false;
 	center_window_if_outside = true;
 
-
 #if DVDNAV_SUPPORT
 	mouse_left_click_function = "dvdnav_mouse";
 #else
@@ -389,6 +378,8 @@ void Preferences::reset() {
 	wheel_function_cycle = Seeking | Volume | Zoom | ChangeSpeed;
 	wheel_function_seeking_reverse = false;
 
+	drag_function = DragDisabled;
+
 	seeking1 = 10;
 	seeking2 = 60;
 	seeking3 = 10*60;
@@ -471,6 +462,19 @@ void Preferences::reset() {
        Network
        ******** */
 
+#ifdef MPV_SUPPORT
+	streaming_type = StreamingAuto;
+#else
+	streaming_type = StreamingYT;
+#endif
+#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
+
 	// Proxy
 	use_proxy = false;
 	proxy_type = QNetworkProxy::HttpProxy;
@@ -524,8 +528,10 @@ void Preferences::reset() {
 
 	mplayer_detected_version = -1; //None version parsed yet
 	mplayer_user_supplied_version = -1;
+#ifdef MPLAYER2_SUPPORT
 	mplayer_is_mplayer2 = false;
 	mplayer2_detected_version = QString::null;
+#endif
 
 
     /* *********
@@ -713,7 +719,10 @@ void Preferences::save() {
 	set->setValue("h264_skip_loop_filter", h264_skip_loop_filter);
 	set->setValue("HD_height", HD_height);
 
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
 	set->setValue("fast_audio_change", fast_audio_change);
+#endif
+
 #if !SMART_DVD_CHAPTERS
 	set->setValue("fast_chapter_change", fast_chapter_change);
 #endif
@@ -730,23 +739,6 @@ void Preferences::save() {
 
 	set->endGroup(); // performance
 
-#ifdef YOUTUBE_SUPPORT
-	set->beginGroup("youtube");
-	set->setValue("enable_yt_support", enable_yt_support);
-	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
-
-#ifdef MPV_SUPPORT
-	set->beginGroup("streaming");
-	set->setValue("enable_streaming_sites", enable_streaming_sites);
-	set->endGroup();
-#endif
-
-
 
     /* *********
        Subtitles
@@ -779,7 +771,7 @@ void Preferences::save() {
 	set->setValue("user_forced_ass_style", user_forced_ass_style);
 
 	set->setValue("freetype_support", freetype_support);
-#ifdef Q_OS_WIN
+#ifdef FONTS_HACK
 	set->setValue("use_windowsfontdir", use_windowsfontdir);
 #endif
 
@@ -874,7 +866,6 @@ void Preferences::save() {
 	set->setValue("style", style);
 #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);
 
@@ -888,6 +879,8 @@ void Preferences::save() {
 	set->setValue("wheel_function_cycle", (int) wheel_function_cycle);
 	set->setValue("wheel_function_seeking_reverse", wheel_function_seeking_reverse);
 
+	set->setValue("drag_function", drag_function);
+
 	set->setValue("seeking1", seeking1);
 	set->setValue("seeking2", seeking2);
 	set->setValue("seeking3", seeking3);
@@ -968,6 +961,19 @@ void Preferences::save() {
        Network
        ******** */
 
+	set->beginGroup("streaming");
+	set->setValue("streaming_type", streaming_type);
+
+	#ifdef YOUTUBE_SUPPORT
+	set->beginGroup("streaming/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
+	set->endGroup(); // streaming
+
 	set->beginGroup("proxy");
 	set->setValue("use_proxy", use_proxy);
 	set->setValue("type", proxy_type);
@@ -1035,8 +1041,10 @@ void Preferences::save() {
 	set->beginGroup( "mplayer_info");
 	set->setValue("mplayer_detected_version", mplayer_detected_version);
 	set->setValue("mplayer_user_supplied_version", mplayer_user_supplied_version);
+#ifdef MPLAYER2_SUPPORT
 	set->setValue("is_mplayer2", mplayer_is_mplayer2);
 	set->setValue("mplayer2_detected_version", mplayer2_detected_version);
+#endif
 	set->endGroup(); // mplayer_info
 
 
@@ -1247,7 +1255,10 @@ void Preferences::load() {
 	h264_skip_loop_filter = (H264LoopFilter) set->value("h264_skip_loop_filter", h264_skip_loop_filter).toInt();
 	HD_height = set->value("HD_height", HD_height).toInt();
 
+#ifdef OBSOLETE_FAST_AUDIO_CHANGE
 	fast_audio_change = (OptionState) set->value("fast_audio_change", fast_audio_change).toInt();
+#endif
+
 #if !SMART_DVD_CHAPTERS
 	fast_chapter_change = set->value("fast_chapter_change", fast_chapter_change).toBool();
 #endif
@@ -1264,22 +1275,6 @@ void Preferences::load() {
 
 	set->endGroup(); // performance
 
-#ifdef YOUTUBE_SUPPORT
-	set->beginGroup("youtube");
-	enable_yt_support = set->value("enable_yt_support", enable_yt_support).toBool();
-	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
-
-#ifdef MPV_SUPPORT
-	set->beginGroup("streaming");
-	enable_streaming_sites = set->value("enable_streaming_sites", enable_streaming_sites).toBool();
-	set->endGroup();
-#endif
-
 
     /* *********
        Subtitles
@@ -1313,7 +1308,7 @@ void Preferences::load() {
 	user_forced_ass_style = set->value("user_forced_ass_style", user_forced_ass_style).toString();
 
 	freetype_support = set->value("freetype_support", freetype_support).toBool();
-#ifdef Q_OS_WIN
+#ifdef FONTS_HACK
 	use_windowsfontdir = set->value("use_windowsfontdir", use_windowsfontdir).toBool();
 #endif
 
@@ -1411,7 +1406,6 @@ void Preferences::load() {
 	style = set->value("style", style).toString();
 #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();
 
@@ -1428,6 +1422,8 @@ void Preferences::load() {
 	}
 	wheel_function_seeking_reverse = set->value("wheel_function_seeking_reverse", wheel_function_seeking_reverse).toBool();
 
+	drag_function = set->value("drag_function", drag_function).toInt();
+
 	seeking1 = set->value("seeking1", seeking1).toInt();
 	seeking2 = set->value("seeking2", seeking2).toInt();
 	seeking3 = set->value("seeking3", seeking3).toInt();
@@ -1508,6 +1504,19 @@ void Preferences::load() {
        Network
        ******** */
 
+	set->beginGroup("streaming");
+	streaming_type = set->value("streaming_type", streaming_type).toInt();
+
+	#ifdef YOUTUBE_SUPPORT
+	set->beginGroup("streaming/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
+	set->endGroup(); // streaming
+
 	set->beginGroup("proxy");
 	use_proxy = set->value("use_proxy", use_proxy).toBool();
 	proxy_type = set->value("type", proxy_type).toInt();
@@ -1572,9 +1581,10 @@ void Preferences::load() {
 	set->beginGroup( "mplayer_info");
 	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();
+#ifdef MPLAYER2_SUPPORT
 	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
 
 
@@ -1693,8 +1703,8 @@ void Preferences::load() {
 			fixed = true;
 		}
 		else
-		if (QFile::exists("mplayer/mpv.exe")) {
-			mplayer_bin = "mplayer/mpv.exe";
+		if (QFile::exists("mpv/mpv.exe")) {
+			mplayer_bin = "mpv/mpv.exe";
 			fixed = true;
 		}
 		if (fixed) {