Changeset 181 for smplayer/trunk/src/filesettings.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/filesettings.cpp (modified) (5 diffs)

smplayer/trunk/src/filesettings.cpp

@@ -19 +19 @@
 #include "filesettings.h"
 #include "mediasettings.h"
+#include "mediadata.h"
 #include <QSettings>
 #include <QFileInfo>
+#include <QDebug>
 
 FileSettings::FileSettings(QString directory) : FileSettingsBase(directory) 
@@ -31 +33 @@
 }
 
-QString FileSettings::filenameToGroupname(const QString & filename) {
+QString FileSettings::filenameToGroupname(const QString & filename, int type) {
         QString s = filename;
         s = s.replace('/', '_');
@@ -39 +41 @@
         s = s.replace(' ', '_');
 
-        QFileInfo fi(filename);
-        if (fi.exists()) {
-                s += "_" + QString::number( fi.size() );
+        if (type == TYPE_FILE) {
+                QFileInfo fi(filename);
+                if (fi.exists()) {
+                        s += "_" + QString::number(fi.size());
+                }
         }
 
-        return s;       
+        return s;
 }
 
-bool FileSettings::existSettingsFor(QString filename) {
-        qDebug("FileSettings::existSettingsFor: '%s'", filename.toUtf8().constData());
+bool FileSettings::existSettingsFor(QString filename, int type) {
+        qDebug() << "FileSettings::existSettingsFor" << filename;
 
-        QString group_name = filenameToGroupname(filename);
+        if (type != TYPE_FILE && type != TYPE_STREAM) return false;
 
-        qDebug("FileSettings::existSettingsFor: group_name: '%s'", group_name.toUtf8().constData());
+        QString group_name = filenameToGroupname(filename, type);
+
+        qDebug() << "FileSettings::existSettingsFor: group_name:" << group_name;
 
         my_settings->beginGroup( group_name );
@@ -61 +67 @@
 }
 
-void FileSettings::loadSettingsFor(QString filename, MediaSettings & mset, int player) {
-        qDebug("FileSettings::loadSettingsFor: '%s'", filename.toUtf8().constData());
+void FileSettings::loadSettingsFor(QString filename, int type, MediaSettings & mset, int player) {
+        qDebug() << "FileSettings::loadSettingsFor:" << filename;
 
-        QString group_name = filenameToGroupname(filename);
+        if (type != TYPE_FILE && type != TYPE_STREAM) return;
 
-        qDebug("FileSettings::loadSettingsFor: group_name: '%s'", group_name.toUtf8().constData());
+        QString group_name = filenameToGroupname(filename, type);
+
+        qDebug() << "FileSettings::loadSettingsFor: group_name:" << group_name;
 
         mset.reset();
@@ -75 +83 @@
 }
 
-void FileSettings::saveSettingsFor(QString filename, MediaSettings & mset, int player) {
-        qDebug("FileSettings::saveSettingsFor: '%s'", filename.toUtf8().constData());
+void FileSettings::saveSettingsFor(QString filename, int type, MediaSettings & mset, int player) {
+        qDebug() << "FileSettings::saveSettingsFor:" << filename;
 
-        QString group_name = filenameToGroupname(filename);
+        if (type != TYPE_FILE && type != TYPE_STREAM) return;
 
-        qDebug("FileSettings::saveSettingsFor: group_name: '%s'", group_name.toUtf8().constData());
+        QString group_name = filenameToGroupname(filename, type);
+
+        qDebug() << "FileSettings::saveSettingsFor: group_name:" << group_name;
 
         my_settings->beginGroup( group_name );