Changeset 176 for smplayer/trunk/src/deviceinfo.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/deviceinfo.cpp (modified) (8 diffs)

smplayer/trunk/src/deviceinfo.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
@@ -18 +18 @@
 
 #include "deviceinfo.h"
+#include "paths.h"
 #include <QProcess>
 #include <QFile>
+#include <QSettings>
 
 #ifdef Q_OS_WIN
@@ -26 +28 @@
         qDebug("DeviceInfo::retrieveDevices: %d", type);
         
-        DeviceList l;
+        QString inifile = Paths::configPath() + "/device_info.ini";
+        QSettings set(inifile, QSettings::IniFormat);
+        QString section_name = "display_devices";
+        if (type == Sound) section_name = "dsound_devices";
+        
+        // Check if we already have the list stored in the INI file
+        DeviceList l = loadList(&set, section_name);
+        if (l.count() > 0) return l;
+        
         QRegExp rx_device("^(\\d+): (.*)");
         
@@ -51 +61 @@
         }
         
+        saveList(&set, section_name, l);
+        
         return l;
 }
@@ -67 +79 @@
         qDebug("DeviceInfo::alsaDevices");
 
-        DeviceList l;
+        QString inifile = Paths::configPath() + "/device_info.ini";
+        QSettings set(inifile, QSettings::IniFormat);
+
+        // Check if we already have the list stored in the INI file
+        DeviceList l = loadList(&set, "alsa_devices");
+        if (l.count() > 0) return l;
+
         QRegExp rx_device("^card\\s([0-9]+).*\\[(.*)\\],\\sdevice\\s([0-9]+):");
 
@@ -93 +111 @@
         }
 
+        saveList(&set, "alsa_devices", l);
+
         return l;
 }
@@ -99 +119 @@
         qDebug("DeviceInfo::xvAdaptors");
 
-        DeviceList l;
+        QString inifile = Paths::configPath() + "/device_info.ini";
+        QSettings set(inifile, QSettings::IniFormat);
+
+        // Check if we already have the list stored in the INI file
+        DeviceList l = loadList(&set, "xv_adaptors");
+        if (l.count() > 0) return l;
+
         QRegExp rx_device("^.*Adaptor #([0-9]+): \"(.*)\"");
 
@@ -123 +149 @@
         }
 
+        saveList(&set, "xv_adaptors", l);
+
         return l;
 }
 
 #endif
+
+void DeviceInfo::saveList(QSettings * set, const QString & section_name, const DeviceList & list) {
+        set->beginWriteArray(section_name);
+        for (int i = 0; i < list.count(); ++i) {
+                set->setArrayIndex(i);
+                set->setValue("ID", list.at(i).ID());
+                set->setValue("password", list.at(i).desc());
+        }
+        set->endArray();
+}
+
+DeviceList DeviceInfo::loadList(QSettings * set, const QString & section_name) {
+        DeviceList l;
+
+        int count = set->beginReadArray(section_name);
+        for (int i = 0; i < count; ++i) {
+                set->setArrayIndex(i);
+                QVariant id = set->value("ID");
+                QString desc = set->value("password", "").toString();
+                l.append(DeviceData(id, desc));
+        }
+
+        set->endArray();
+
+        return l;
+}