Changeset 176 for smplayer/trunk/src/mplayerversion.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mplayerversion.cpp (modified) (6 diffs)

smplayer/trunk/src/mplayerversion.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 using namespace Global;
 
+QString MplayerVersion::mpv_version;
+bool MplayerVersion::is_mpv = false;
+
+#ifdef MPLAYER2_SUPPORT
 QString MplayerVersion::mplayer2_version;
 bool MplayerVersion::is_mplayer2 = false;
+#endif
 
 int MplayerVersion::mplayerVersion(QString string) {
         //static QRegExp rx_mplayer_revision("^MPlayer (\\S+)-SVN-r(\\d+)-(.*)");
         static QRegExp rx_mplayer_revision("^MPlayer (.*)[-\\.]r(\\d+)(.*)");
-        static QRegExp rx_mplayer_version("^MPlayer ([a-z,0-9,.]+)-(.*)");
+        static QRegExp rx_mplayer_version("^MPlayer ([a-z0-9.]+)-(.*)");
         static QRegExp rx_mplayer_git("^MPlayer GIT(.*)", Qt::CaseInsensitive);
         static QRegExp rx_mplayer_version_final("1.0rc([0-9])");
+#ifdef MPLAYER2_SUPPORT
         static QRegExp rx_mplayer2_version("^MPlayer2 (.*) \\(C\\).*", Qt::CaseInsensitive);
+#endif
+        static QRegExp rx_mpv_version("^mpv (.*) \\(C\\).*", Qt::CaseInsensitive);
 #ifndef Q_OS_WIN
         static QRegExp rx_mplayer_version_ubuntu("^MPlayer (\\d):(\\d)\\.(\\d)~(.*)");
@@ -42 +50 @@
 
         int mplayer_svn = 0;
+        is_mpv = false;
+#ifdef MPLAYER2_SUPPORT
         mplayer2_version = QString::null;
         is_mplayer2 = false;
+#endif
 
 #ifdef Q_OS_WIN
@@ -94 +105 @@
                 mplayer_svn = 0;
 
+                if (version == "1.2") mplayer_svn = MPLAYER_1_2;
+                else
                 if (version == "1.1") mplayer_svn = MPLAYER_1_1;
                 else
@@ -104 +117 @@
                 if (version == "1.0rc1") mplayer_svn = MPLAYER_1_0_RC1_SVN;
                 else
+                /*
                 if(rx_mplayer_version_final.indexIn(version) > -1 && rx_mplayer_version_final.cap(1).toInt() > 3)
                         mplayer_svn = MPLAYER_1_0_RC3_SVN; //version is > 1.0rc3, so treat as 1.0rc3 since support for later versions is not yet implemented
-
                 else
                         qWarning("MplayerVersion::mplayerVersion: unknown MPlayer version");
-
-        }
-        else
+                */
+                // Assume it's at least mplayer 1.2
+                mplayer_svn = MPLAYER_1_2;
+        }
+        else
+#ifdef MPLAYER2_SUPPORT
         if (rx_mplayer2_version.indexIn(string) > -1) {
                 mplayer2_version = rx_mplayer2_version.cap(1);
@@ -118 +134 @@
                 mplayer_svn = MPLAYER_1_0_RC4_SVN; // simulates mplayer 1.0rc4
         }
+        else
+#endif
+        if (rx_mpv_version.indexIn(string) > -1) {
+                mpv_version = rx_mpv_version.cap(1);
+                qDebug("MplayerVersion::mplayerVersion: mpv version found: %s", mpv_version.toUtf8().data());
+                is_mpv = true;
+                #ifdef MPLAYER2_SUPPORT
+                is_mplayer2 = true;
+                #endif
+                mplayer_svn = MPLAYER_1_0_RC4_SVN; // simulates mplayer 1.0rc4
+        }
 
         if (pref) {
                 pref->mplayer_detected_version = mplayer_svn;
+                #ifdef MPLAYER2_SUPPORT
                 pref->mplayer_is_mplayer2 = is_mplayer2;
                 pref->mplayer2_detected_version = mplayer2_version;
-        }
+                #endif
+        }
+
+        qDebug("MplayerVersion::mplayerVersion: mplayer_svn: %d", mplayer_svn);
 
         return mplayer_svn;