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

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/preferences.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -127 +127 @@
         use_slices = false;
         autoq = 6;
+
+#ifdef ADD_BLACKBORDERS_FS
         add_blackborders_on_fullscreen = false;
+#endif
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -363 +366 @@
 #endif
 
+#ifdef MPV_SUPPORT
+        mpv_osd_media_info = "";
+#endif
+#ifdef MPLAYER_SUPPORT
+        mplayer_osd_media_info = "";
+#endif
+
 
     /* *********
@@ -538 +548 @@
         initial_sub_pos = 100; // 100%
 
+#ifdef INITIAL_BLACKBORDERS
+        initial_blackborders = false;
+#endif
+
         initial_postprocessing = false;
         initial_volnorm = false;
@@ -655 +669 @@
         set->setValue("use_slices", use_slices );
         set->setValue("autoq", autoq);
+
+#ifdef ADD_BLACKBORDERS_FS
         set->setValue("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen);
+#endif
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -881 +898 @@
 #ifdef MPRIS2
         set->setValue("use_mpris2", use_mpris2);
+#endif
+
+#ifdef MPV_SUPPORT
+        set->setValue("mpv_osd_media_info", mpv_osd_media_info);
+#endif
+#ifdef MPLAYER_SUPPORT
+        set->setValue("mplayer_osd_media_info", mplayer_osd_media_info);
 #endif
 
@@ -1064 +1088 @@
 
         set->setValue("initial_volnorm", initial_volnorm);
+
+#ifdef INITIAL_BLACKBORDERS
+        set->setValue("initial_blackborders", initial_blackborders);
+#endif
+
         set->setValue("initial_postprocessing", initial_postprocessing);
 
@@ -1207 +1236 @@
         use_slices = set->value("use_slices", use_slices ).toBool();
         autoq = set->value("autoq", autoq).toInt();
+
+#ifdef ADD_BLACKBORDERS_FS
         add_blackborders_on_fullscreen = set->value("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen).toBool();
+#endif
 
 #if defined (Q_OS_WIN) || defined(Q_OS_OS2)
@@ -1437 +1469 @@
 #ifdef MPRIS2
         use_mpris2 = set->value("use_mpris2", use_mpris2).toBool();
+#endif
+
+#ifdef MPV_SUPPORT
+        mpv_osd_media_info = set->value("mpv_osd_media_info", mpv_osd_media_info).toString();
+#endif
+#ifdef MPLAYER_SUPPORT
+        mplayer_osd_media_info = set->value("mplayer_osd_media_info", mplayer_osd_media_info).toString();
 #endif
 
@@ -1620 +1659 @@
 
         initial_volnorm = set->value("initial_volnorm", initial_volnorm).toBool();
+
+#ifdef INITIAL_BLACKBORDERS
+        initial_blackborders = set->value("initial_blackborders", initial_blackborders).toBool();
+#endif
+
         initial_postprocessing = set->value("initial_postprocessing", initial_postprocessing).toBool();