Changeset 175 for smplayer/vendor/current/src/paths.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

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

smplayer/vendor/current/src/paths.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -161 +161 @@
 }
 
-#ifdef Q_OS_WIN
+#ifdef FONTS_HACK
 QString Paths::fontPath() {
-        return appPath() + "/mplayer/open-fonts";
+        QString path = appPath() + "/mplayer/fonts";
+        QDir font_dir(path);
+        QStringList files = font_dir.entryList(QStringList() << "*.ttf" << "*.otf", QDir::Files);
+        //qDebug("Paths:fontPath: files in %s: %d", path.toUtf8().constData(), files.count());
+        if (files.count() > 0) {
+                return path;
+        } else {
+                return appPath() + "/open-fonts";
+        }
 }
 #endif