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

Timestamp:

Dec 3, 2012, 5:29:00 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: updated vendor to 0.8.2

File:

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

smplayer/vendor/current/src/mplayerversion.cpp

@@ -37 +37 @@
 #ifndef Q_OS_WIN
         static QRegExp rx_mplayer_version_ubuntu("^MPlayer (\\d):(\\d)\\.(\\d)~(.*)");
+        static QRegExp rx_mplayer_revision_ubuntu("^MPlayer svn r(\\d+) (.*)");
         static QRegExp rx_mplayer_version_mandriva("^MPlayer ([a-z0-9\\.]+)-\\d+\\.([a-z0-9]+)\\.[\\d\\.]+[a-z]+[\\d\\.]+-(.*)");
 #endif
@@ -60 +61 @@
                 qDebug("MplayerVersion::mplayerVersion: line converted to '%s'", string.toUtf8().data());
         }
+        else
+        if (rx_mplayer_revision_ubuntu.indexIn(string) > -1) {
+                int svn = rx_mplayer_revision_ubuntu.cap(1).toInt();
+                QString rest = rx_mplayer_revision_ubuntu.cap(2);
+                string = QString("MPlayer SVN-r%1-%2").arg(svn).arg(rest);
+                qDebug("MplayerVersion::mplayerVersion: line converted to '%s'", string.toUtf8().data());
+        }
+
         // Hack to recognize mplayer version from Mandriva:
         if (rx_mplayer_version_mandriva.indexIn(string) > -1) {
@@ -85 +94 @@
                 mplayer_svn = 0;
 
+                if (version == "1.1") mplayer_svn = MPLAYER_1_1;
+                else
                 if (version == "1.0rc4") mplayer_svn = MPLAYER_1_0_RC4_SVN;
                 else
@@ -165 +176 @@
                 case MPLAYER_1_0_RC3_SVN: version = QString("1.0rc3"); break;
                 case MPLAYER_1_0_RC4_SVN: version = QString("1.0rc4"); break;
+                case MPLAYER_1_1: version = QString("1.1"); break;
                 default : version =  QString("SVN r%1").arg(svn_revision);
         }