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

Timestamp:

Dec 22, 2011, 6:27:52 PM (14 years ago)

Author:

Silvan Scherrer

Message:

smplayer vendor udate

File:

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

smplayer/vendor/current/src/mplayerversion.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -30 +30 @@
         static QRegExp rx_mplayer_version("^MPlayer ([a-z,0-9,.]+)-(.*)");
         static QRegExp rx_mplayer_git("^MPlayer GIT(.*)", Qt::CaseInsensitive);
+        static QRegExp rx_mplayer_version_final("1.0rc([0-9])");
 #ifndef Q_OS_WIN
         static QRegExp rx_mplayer_version_ubuntu("^MPlayer (\\d):(\\d)\\.(\\d)~(.*)");
@@ -77 +78 @@
                 qDebug("MplayerVersion::mplayerVersion: MPlayer version found: %s", version.toUtf8().data());
                 mplayer_svn = 0;
+
                 if (version == "1.0rc3") mplayer_svn = MPLAYER_1_0_RC3_SVN;
                 else
@@ -82 +84 @@
                 else
                 if (version == "1.0rc1") mplayer_svn = MPLAYER_1_0_RC1_SVN;
-                else qWarning("MplayerVersion::mplayerVersion: unknown MPlayer version");
+                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");
+
         }