Changeset 189 for smplayer/trunk/src

Timestamp:

Jan 24, 2017, 1:52:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: adjust version info in readme and some small glitches

Location:

smplayer/trunk/src

Files:

• deviceinfo.cpp (modified) (1 diff)
• deviceinfo.h (modified) (1 diff)
• mpvoptions.cpp (modified) (4 diffs)
• playlist.cpp (modified) (1 diff)
• smplayer.pro (modified) (1 diff)

smplayer/trunk/src/deviceinfo.cpp

@@ -245 +245 @@
 #endif
 
-#ifdef USE_XV_ADAPTORS
+#if USE_XV_ADAPTORS
 DeviceList DeviceInfo::xvAdaptors() {
         qDebug("DeviceInfo::xvAdaptors");

smplayer/trunk/src/deviceinfo.h

@@ -27 +27 @@
 #define USE_DSOUND_DEVICES 1
 #define USE_MPV_WASAPI_DEVICES 1
+#elif defined(Q_OS_OS2)
+#define USE_ALSA_DEVICES 1
+#define USE_MPV_ALSA_DEVICES 0
+#define USE_PULSEAUDIO_DEVICES 0
+#define USE_XV_ADAPTORS 0
 #else
 #define USE_ALSA_DEVICES 0

smplayer/trunk/src/mpvoptions.cpp

@@ -343 +343 @@
                 QString vo = value.toString();
                 if (vo.endsWith(",")) vo.chop(1);
-                #ifndef Q_OS_WIN
+                #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
                 if (isOptionAvailable("--xv-adaptor")) {
                         QRegExp rx("xv:adaptor=(\\d+)");
@@ -365 +365 @@
                 if (isOptionAvailable("--audio-device")) {
                         if (l.count() == 3) {
-                                #ifndef Q_OS_WIN
+                                #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
                                 if (l[0] == "pulse") {
                                         arg << "--audio-device=pulse/" + l[2];
@@ -375 +375 @@
                                 }
                                 #endif
-                                #else
+                                #elif defined(Q_OS_WIN)
                                 if (l[0] == "dsound") {
                                         arg << "--audio-device=dsound/" + l[1];
@@ -386 +386 @@
                         }
                 } else {
-                        #ifndef Q_OS_WIN
+                        #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
                         if (l.count() > 1) {
                                 if (l[0] == "alsa") {

smplayer/trunk/src/playlist.cpp

@@ -1960 +1960 @@
                 text += itemData(current)->filename();
                 if (n < count-1) {
-                        #ifdef Q_OS_WIN
+                        #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
                         text += "\r\n";
                         #else

smplayer/trunk/src/smplayer.pro

@@ -38 +38 @@
 DEFINES += ADD_BLACKBORDERS_FS
 DEFINES += INITIAL_BLACKBORDERS
+!os2 {
 DEFINES += CHROMECAST_SUPPORT
-
-!os2 {
 DEFINES += MPV_SUPPORT
 }