Changeset 165 for smplayer/trunk/src/smplayer.h

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/smplayer.h (modified) (3 diffs)

smplayer/trunk/src/smplayer.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -55 +55 @@
         void showInfo();
         void deleteConfig();
+#ifdef Q_OS_WIN
+        void createFontFile();
+#endif
 
         static BaseGui * main_window;
@@ -77 +80 @@
         // Output log
         static QFile output_log;
+        #if QT_VERSION >= 0x050000
+        static void myMessageOutput( QtMsgType type, const QMessageLogContext &, const QString & msg );
+        #else
         static void myMessageOutput( QtMsgType type, const char *msg );
+        #endif
         static bool allow_to_send_log_to_gui;
 #endif