Changeset 179 for smplayer/vendor/current/src/filesettingshash.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/filesettingshash.cpp (modified) (5 diffs)

smplayer/vendor/current/src/filesettingshash.cpp

@@ -19 +19 @@
 #include "filesettingshash.h"
 #include "mediasettings.h"
+#include "mediadata.h"
 #include "filehash.h" // hash function
 #include <QSettings>
 #include <QFile>
 #include <QDir>
+#include <QDebug>
 
 FileSettingsHash::FileSettingsHash(QString directory) : FileSettingsBase(directory) 
@@ -33 +35 @@
 
 
-QString FileSettingsHash::configFile(const QString & filename, QString * output_dir) {
+QString FileSettingsHash::configFile(const QString & filename, int type, QString * output_dir) {
         QString res;
 
-        QString hash = FileHash::calculateHash(filename);
+        QString hash;
+        if (type == TYPE_FILE) {
+                hash = FileHash::calculateHash(filename);
+        } else {
+                QByteArray ba;
+                for (int n = filename.count()-1; n >= 0; --n) {
+                        ba += filename.at(n);
+                }
+                //qDebug() << "FileSettingsHash::configFile: ba:" << ba;
+                hash = ba.toBase64();
+        }
+
         if (!hash.isEmpty()) {
                 if (output_dir != 0) (*output_dir) = hash[0];
@@ -44 +57 @@
 }
 
-bool FileSettingsHash::existSettingsFor(QString filename) {
-        qDebug("FileSettingsHash::existSettingsFor: '%s'", filename.toUtf8().constData());
+bool FileSettingsHash::existSettingsFor(QString filename, int type) {
+        qDebug() << "FileSettingsHash::existSettingsFor:" << filename;
 
-        QString config_file = configFile(filename);
+        if (type != TYPE_FILE && type != TYPE_STREAM) return false;
 
-        qDebug("FileSettingsHash::existSettingsFor: config_file: '%s'", config_file.toUtf8().constData());
+        QString config_file = configFile(filename, type);
+
+        qDebug() << "FileSettingsHash::existSettingsFor: config_file:" << config_file;
 
         return QFile::exists(config_file);
 }
 
-void FileSettingsHash::loadSettingsFor(QString filename, MediaSettings & mset, int player) {
-        qDebug("FileSettings::loadSettingsFor: '%s'", filename.toUtf8().constData());
+void FileSettingsHash::loadSettingsFor(QString filename, int type, MediaSettings & mset, int player) {
+        qDebug() << "FileSettings::loadSettingsFor:" << filename << "type:" << type;
 
-        QString config_file = configFile(filename);
+        if (type != TYPE_FILE && type != TYPE_STREAM) return;
 
-        qDebug("FileSettingsHash::loadSettingsFor: config_file: '%s'", config_file.toUtf8().constData());
+        QString config_file = configFile(filename, type);
+
+        qDebug() << "FileSettingsHash::loadSettingsFor: config_file:" << config_file;
 
         mset.reset();
@@ -72 +89 @@
 }
 
-void FileSettingsHash::saveSettingsFor(QString filename, MediaSettings & mset, int player) {
-        qDebug("FileSettingsHash::saveSettingsFor: '%s'", filename.toUtf8().constData());
+void FileSettingsHash::saveSettingsFor(QString filename, int type, MediaSettings & mset, int player) {
+        qDebug() << "FileSettingsHash::saveSettingsFor:" << filename << "type:" << type;
+
+        if (type != TYPE_FILE && type != TYPE_STREAM) return;
 
         QString output_dir;
-        QString config_file = configFile(filename, &output_dir);
+        QString config_file = configFile(filename, type, &output_dir);
 
-        qDebug("FileSettingsHash::saveSettingsFor: config_file: '%s'", config_file.toUtf8().constData());
-        qDebug("FileSettingsHash::saveSettingsFor: output_dir: '%s'", output_dir.toUtf8().constData());
+        qDebug() << "FileSettingsHash::saveSettingsFor: config_file:" << config_file;
+        qDebug() << "FileSettingsHash::saveSettingsFor: output_dir:" << output_dir;
 
         if (!config_file.isEmpty()) {
@@ -85 +104 @@
                 if (!d.exists(output_dir)) {
                         if (!d.mkpath(output_dir)) {
-                                qWarning("FileSettingsHash::saveSettingsFor: can't create directory '%s'", QString(base_dir + "/" + output_dir).toUtf8().constData());
+                                qWarning() << "FileSettingsHash::saveSettingsFor: can't create directory" << QString(base_dir + "/" + output_dir);
                                 return;
                         }