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

Timestamp:

Dec 22, 2011, 6:27:52 PM (14 years ago)

Author:

Silvan Scherrer

Message:

smplayer vendor udate

File:

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

smplayer/vendor/current/src/preferences.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -60 +60 @@
        ******* */
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         mplayer_bin= "mplayer/mplayer.exe";
 #else
@@ -93 +93 @@
         add_blackborders_on_fullscreen = false;
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         turn_screensaver_off = false;
         avoid_screensaver = true;
@@ -101 +101 @@
 
 #ifndef Q_OS_WIN
-        disable_video_filters_with_vdpau = true;
+        vdpau.ffh264vdpau = true;
+        vdpau.ffmpeg12vdpau = true;
+        vdpau.ffwmv3vdpau = true;
+        vdpau.ffvc1vdpau = true;
+        vdpau.ffodivxvdpau = false;
+        vdpau.disable_video_filters = true;
 #endif
 
@@ -194 +199 @@
         ass_line_spacing = 0;
 
-        use_closed_caption_subs = false;
         use_forced_subs_only = false;
 
@@ -275 +279 @@
         actions_to_run = "";
 
+        show_tag_in_window_title = true;
+
 
     /* *********
@@ -292 +298 @@
 #endif
 
-        show_motion_vectors = false;
 
 #if DVDNAV_SUPPORT
@@ -318 +323 @@
 #endif
 #if SEEKBAR_RESOLUTION
-        relative_seeking = true;
+        relative_seeking = false;
 #endif
 
@@ -326 +331 @@
         balloon_count = 5;
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         restore_pos_after_fullscreen = true;
 #else
@@ -496 +501 @@
         set->setValue("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen);
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         set->setValue("turn_screensaver_off", turn_screensaver_off);
         set->setValue("avoid_screensaver", avoid_screensaver);
@@ -504 +509 @@
 
 #ifndef Q_OS_WIN
-        set->setValue("disable_video_filters_with_vdpau", disable_video_filters_with_vdpau);
+        set->setValue("vdpau_ffh264vdpau", vdpau.ffh264vdpau);
+        set->setValue("vdpau_ffmpeg12vdpau", vdpau.ffmpeg12vdpau);
+        set->setValue("vdpau_ffwmv3vdpau", vdpau.ffwmv3vdpau);
+        set->setValue("vdpau_ffvc1vdpau", vdpau.ffvc1vdpau);
+        set->setValue("vdpau_ffodivxvdpau", vdpau.ffodivxvdpau);
+        set->setValue("vdpau_disable_video_filters", vdpau.disable_video_filters);
 #endif
 
@@ -602 +612 @@
         set->setValue("use_ass_subtitles", use_ass_subtitles);
         set->setValue("ass_line_spacing", ass_line_spacing);
-        set->setValue("use_closed_caption_subs", use_closed_caption_subs);
         set->setValue("use_forced_subs_only", use_forced_subs_only);
 
@@ -677 +686 @@
         set->setValue("actions_to_run", actions_to_run);
 
+        set->setValue("show_tag_in_window_title", show_tag_in_window_title);
+
         set->endGroup(); // advanced
 
@@ -697 +708 @@
         set->setValue("style", style);
 #endif
-
-        set->setValue("show_motion_vectors", show_motion_vectors);
 
         set->setValue("mouse_left_click_function", mouse_left_click_function);
@@ -909 +918 @@
         add_blackborders_on_fullscreen = set->value("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen).toBool();
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         turn_screensaver_off = set->value("turn_screensaver_off", turn_screensaver_off).toBool();
         avoid_screensaver = set->value("avoid_screensaver", avoid_screensaver).toBool();
@@ -917 +926 @@
 
 #ifndef Q_OS_WIN
-        disable_video_filters_with_vdpau = set->value("disable_video_filters_with_vdpau", disable_video_filters_with_vdpau).toBool();
+        vdpau.ffh264vdpau = set->value("vdpau_ffh264vdpau", vdpau.ffh264vdpau).toBool();
+        vdpau.ffmpeg12vdpau = set->value("vdpau_ffmpeg12vdpau", vdpau.ffmpeg12vdpau).toBool();
+        vdpau.ffwmv3vdpau = set->value("vdpau_ffwmv3vdpau", vdpau.ffwmv3vdpau).toBool();
+        vdpau.ffvc1vdpau = set->value("vdpau_ffvc1vdpau", vdpau.ffvc1vdpau).toBool();
+        vdpau.ffodivxvdpau = set->value("vdpau_ffodivxvdpau", vdpau.ffodivxvdpau).toBool();
+        vdpau.disable_video_filters = set->value("vdpau_disable_video_filters", vdpau.disable_video_filters).toBool();
 #endif
 
@@ -1016 +1030 @@
         ass_line_spacing = set->value("ass_line_spacing", ass_line_spacing).toInt();
 
-        use_closed_caption_subs = set->value("use_closed_caption_subs", use_closed_caption_subs).toBool();
         use_forced_subs_only = set->value("use_forced_subs_only", use_forced_subs_only).toBool();
 
@@ -1094 +1107 @@
         actions_to_run = set->value("actions_to_run", actions_to_run).toString();
 
+        show_tag_in_window_title = set->value("show_tag_in_window_title", show_tag_in_window_title).toBool();
+
         set->endGroup(); // advanced
 
@@ -1114 +1129 @@
         style = set->value("style", style).toString();
 #endif
-
-        show_motion_vectors = set->value("show_motion_vectors", show_motion_vectors).toBool();
 
         mouse_left_click_function = set->value("mouse_left_click_function", mouse_left_click_function).toString();