Changeset 163 for smplayer/vendor/current/src/smplayer.cpp

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

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

smplayer/vendor/current/src/smplayer.cpp ¶

@@ -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
@@ -20 +20 @@
 #include "defaultgui.h"
 #include "minigui.h"
-#include "mpcgui.h"
 #include "global.h"
 #include "paths.h"
@@ -30 +29 @@
 #include "myapplication.h"
 
+#ifdef MPCGUI
+#include "mpcgui.h"
+#endif
+
 #ifdef SKINS
 #include "skingui.h"
@@ -59 +62 @@
 {
 #ifdef LOG_SMPLAYER
+        #if QT_VERSION >= 0x050000
+        qInstallMessageHandler( SMPlayer::myMessageOutput );
+        #else
         qInstallMsgHandler( SMPlayer::myMessageOutput );
+        #endif
         allow_to_send_log_to_gui = true;
 #endif
@@ -81 +88 @@
         translator->load( pref->language );
         showInfo();
+
+#ifdef Q_OS_WIN
+        createFontFile();
+#endif
 }
 
@@ -145 +156 @@
         if (gui_name.toLower() == "minigui") 
                 gui = new MiniGui(0);
-        else 
+        else
+#ifdef MPCGUI
         if (gui_name.toLower() == "mpcgui")
                 gui = new MpcGui(0);
         else
+#endif
                 gui = new DefaultGui(0);
 
@@ -439 +452 @@
                 }
                 #endif
+        }
+}
+#endif
+
+#ifdef Q_OS_WIN
+void SMPlayer::createFontFile() {
+        qDebug("SMPlayer::createFontFile");
+        QString output = Paths::configPath() + "/fonts.conf";
+
+        // Check if the file already exists with the modified path
+        if (QFile::exists(output)) {
+                QFile i(output);
+                if (i.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                        QString text = i.readAll();
+                        if (text.contains("<dir>" + Paths::fontPath() + "</dir>")) {
+                                qDebug("SMPlayer::createFontFile: file %s already exists with font path. Doing nothing.", output.toUtf8().constData());
+                                return;
+                        }
+                }
+        }
+
+        QString input = Paths::appPath() + "/mplayer/fonts/fonts.conf";
+        qDebug("SMPlayer::createFontFile: input: %s", input.toLatin1().constData());
+        QFile infile(input);
+        if (infile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                QString text = infile.readAll();
+                text = text.replace("<dir>WINDOWSFONTDIR</dir>", "<dir>" + Paths::fontPath() + "</dir>");
+                //qDebug("SMPlayer::createFontFile: %s", text.toUtf8().constData());
+
+                qDebug("SMPlayer::createFontFile: saving %s", output.toUtf8().constData());
+                QFile outfile(output);
+                if (outfile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+                        outfile.write(text.toUtf8());
+                        outfile.close();
+                }
         }
 }
@@ -492 +540 @@
         qDebug(" * file for subtitles' styles: '%s'", Paths::subtitleStyleFile().toUtf8().data());
         qDebug(" * current path: '%s'", QDir::currentPath().toUtf8().data());
+#ifdef Q_OS_WIN
+        qDebug(" * font path: '%s'", Paths::fontPath().toUtf8().data());
+#endif
 }
 
@@ -498 +549 @@
 bool SMPlayer::allow_to_send_log_to_gui = false;
 
+#if QT_VERSION >= 0x050000
+void SMPlayer::myMessageOutput( QtMsgType type, const QMessageLogContext &, const QString & msg ) {
+#else
 void SMPlayer::myMessageOutput( QtMsgType type, const char *msg ) {
+#endif
         static QStringList saved_lines;
         static QString orig_line;
@@ -513 +568 @@
         line2.clear();
 
+#if QT_VERSION >= 0x050000
+        orig_line = msg;
+#else
         orig_line = QString::fromUtf8(msg);
+#endif
 
         switch ( type ) {