Changeset 121 for smplayer/vendor/current/src/mplayerversion.cpp

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/mplayerversion.cpp (modified) (7 diffs)

smplayer/vendor/current/src/mplayerversion.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 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::mplayer2_version;
+bool MplayerVersion::is_mplayer2 = false;
+
 int MplayerVersion::mplayerVersion(QString string) {
         //static QRegExp rx_mplayer_revision("^MPlayer (\\S+)-SVN-r(\\d+)-(.*)");
@@ -31 +34 @@
         static QRegExp rx_mplayer_git("^MPlayer GIT(.*)", Qt::CaseInsensitive);
         static QRegExp rx_mplayer_version_final("1.0rc([0-9])");
+        static QRegExp rx_mplayer2_version("^MPlayer2 (.*) \\(C\\).*");
 #ifndef Q_OS_WIN
         static QRegExp rx_mplayer_version_ubuntu("^MPlayer (\\d):(\\d)\\.(\\d)~(.*)");
@@ -37 +41 @@
 
         int mplayer_svn = 0;
+        mplayer2_version = QString::null;
+        is_mplayer2 = false;
 
 #ifdef Q_OS_WIN
@@ -79 +85 @@
                 mplayer_svn = 0;
 
+                if (version == "1.0rc4") mplayer_svn = MPLAYER_1_0_RC4_SVN;
+                else
                 if (version == "1.0rc3") mplayer_svn = MPLAYER_1_0_RC3_SVN;
                 else
@@ -92 +100 @@
 
         }
+        else
+        if (rx_mplayer2_version.indexIn(string) > -1) {
+                mplayer2_version = rx_mplayer2_version.cap(1);
+                qDebug("MplayerVersion::mplayerVersion: MPlayer2 version found: %s", mplayer2_version.toUtf8().data());
+                is_mplayer2 = true;
+                mplayer_svn = MPLAYER_1_0_RC4_SVN; // simulates mplayer 1.0rc4
+        }
 
         if (pref) {
                 pref->mplayer_detected_version = mplayer_svn;
+                pref->mplayer_is_mplayer2 = is_mplayer2;
+                pref->mplayer2_detected_version = mplayer2_version;
         }
 
@@ -147 +164 @@
                 case MPLAYER_1_0_RC2_SVN: version = QString("1.0rc2"); break;
                 case MPLAYER_1_0_RC3_SVN: version = QString("1.0rc3"); break;
+                case MPLAYER_1_0_RC4_SVN: version = QString("1.0rc4"); break;
                 default : version =  QString("SVN r%1").arg(svn_revision);
         }