Changeset 156 for smplayer/trunk/src/version.cpp

Timestamp:

Feb 21, 2014, 5:26:03 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.6

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/version.cpp (modified) (2 diffs)

smplayer/trunk/src/version.cpp

@@ -21 +21 @@
 #define USE_SVN_VERSIONS 0
 
-#define VERSION "0.8.5"
+#define VERSION "0.8.6"
 
 #if USE_SVN_VERSIONS
 #include <svn_revision.h>
+#else
+#define SVN_REVISION "5637"
 #endif
 
 #ifdef Q_OS_WIN
-#if defined( _WIN64 )
+#if defined(_WIN64)
 #define SMPWIN_ARCH "(64-bit)"
-#elif defined( _WIN32 )
+#elif defined(_WIN32) && !defined(_WIN64)
 #define SMPWIN_ARCH "(32-bit)"
 #endif
 #endif
 
-QString smplayerVersion() {
+QString Version::printable() {
 #if USE_SVN_VERSIONS
 #ifdef Q_OS_WIN
-    return QString(QString(VERSION) + "+" + QString(SVN_REVISION) + " " + QString(SMPWIN_ARCH));
+    return QString(QString(VERSION) + " (svn r" + QString(SVN_REVISION) + ") " + QString(SMPWIN_ARCH));
 #else
-    return QString(QString(VERSION) + "+" + QString(SVN_REVISION));
+    return QString(QString(VERSION) + " (svn r" + QString(SVN_REVISION) + ")");
 #endif
 #else
@@ -51 +53 @@
 }
 
-QString stableVersion() {
+QString Version::stable() {
         return QString(VERSION);
 }
+
+QString Version::revision() {
+        return QString(SVN_REVISION);
+}
+