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

Timestamp:

Aug 31, 2016, 5:19:25 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.8.0

File:

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

smplayer/vendor/current/src/mplayerversion.cpp

@@ -22 +22 @@
 
 #include <QRegExp>
+#include <QDebug>
 
 using namespace Global;
@@ -36 +37 @@
         //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-z0-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])");
@@ -60 +61 @@
         if (string.startsWith("MPlayer CCCP ")) { 
                 string.remove("CCCP "); 
-                qDebug("MplayerVersion::mplayerVersion: removing CCCP: '%s'", string.toUtf8().data()); 
+                qDebug() << "MplayerVersion::mplayerVersion: removing CCCP:" << string;
         }
 #else
@@ -70 +71 @@
                 //qDebug("%d - %d - %d", rx_mplayer_version_ubuntu.cap(1).toInt(), v1 , v2);
                 string = QString("MPlayer %1.%2%3").arg(v1).arg(v2).arg(rest);
-                qDebug("MplayerVersion::mplayerVersion: line converted to '%s'", string.toUtf8().data());
+                qDebug() << "MplayerVersion::mplayerVersion: line converted to" << string;
         }
         else
@@ -77 +78 @@
                 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());
+                qDebug() << "MplayerVersion::mplayerVersion: line converted to" << string;
         }
 
@@ -86 +87 @@
                 QString rest = rx_mplayer_version_mandriva.cap(3);
                 string = QString("MPlayer %1%2-%3").arg(v1).arg(v2).arg(rest);
-                qDebug("MplayerVersion::mplayerVersion: line converted to '%s'", string.toUtf8().data());
+                qDebug() << "MplayerVersion::mplayerVersion: line converted to" << string;
         }
 #endif
@@ -97 +98 @@
         if (rx_mplayer_revision.indexIn(string) > -1) {
                 mplayer_svn = rx_mplayer_revision.cap(2).toInt();
-                qDebug("MplayerVersion::mplayerVersion: MPlayer SVN revision found: %d", mplayer_svn);
+                qDebug() << "MplayerVersion::mplayerVersion: MPlayer SVN revision found:" << mplayer_svn;
         } 
         else
         if (rx_mplayer_version.indexIn(string) > -1) {
                 QString version = rx_mplayer_version.cap(1);
-                qDebug("MplayerVersion::mplayerVersion: MPlayer version found: %s", version.toUtf8().data());
+                qDebug() << "MplayerVersion::mplayerVersion: MPlayer version found:" << version;
                 mplayer_svn = 0;
 
@@ -130 +131 @@
         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());
+                qDebug() << "MplayerVersion::mplayerVersion: MPlayer2 version found:" << mplayer2_version;
                 is_mplayer2 = true;
                 mplayer_svn = MPLAYER_1_0_RC4_SVN; // simulates mplayer 1.0rc4
@@ -138 +139 @@
         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());
+                qDebug() << "MplayerVersion::mplayerVersion: mpv version found:" << mpv_version;
                 is_mpv = true;
                 #ifdef MPLAYER2_SUPPORT
@@ -154 +155 @@
         }
 
-        qDebug("MplayerVersion::mplayerVersion: mplayer_svn: %d", mplayer_svn);
+        qDebug() << "MplayerVersion::mplayerVersion: mplayer_svn:" << mplayer_svn;
 
         return mplayer_svn;