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

Timestamp:

Aug 31, 2016, 7:22:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: restore some os/2 removals from vendor, fix branding

File:

• smplayer/trunk/src/preferences.cpp (modified) (5 diffs)

smplayer/trunk/src/preferences.cpp

@@ -80 +80 @@
 #endif
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#if defined(Q_OS_WIN)
         //mplayer_bin= "mplayer/mplayer.exe";
         mplayer_bin= "mpv/mpv.exe";
+#elif defined(Q_OS_OS2)
+        mplayer_bin= "mplayer/mplayer.exe";
 #else
         //mplayer_bin = "mplayer";
@@ -127 +129 @@
         add_blackborders_on_fullscreen = false;
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         turn_screensaver_off = false;
@@ -655 +657 @@
         set->setValue("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen);
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         #ifdef SCREENSAVER_OFF
         set->setValue("turn_screensaver_off", turn_screensaver_off);
@@ -1207 +1209 @@
         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)
         #ifdef SCREENSAVER_OFF
         turn_screensaver_off = set->value("turn_screensaver_off", turn_screensaver_off).toBool();
@@ -1759 +1761 @@
 
 #if defined(MPV_SUPPORT) && defined(MPLAYER_SUPPORT)
-        #ifdef Q_OS_WIN
+        #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
         // Check if the mplayer binary exists and try to fix it
         if (!QFile::exists(mplayer_bin)) {