Changeset 181 for smplayer/trunk/src/deviceinfo.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/deviceinfo.cpp (modified) (10 diffs)

smplayer/trunk/src/deviceinfo.cpp

@@ -27 +27 @@
 DeviceList DeviceInfo::retrieveDevices(DeviceType type) {
         qDebug("DeviceInfo::retrieveDevices: %d", type);
-        
+
+        DeviceList l;
+
+        #ifdef CACHE_DEVICE_INFO
         QString inifile = Paths::configPath() + "/device_info.ini";
         QSettings set(inifile, QSettings::IniFormat);
-        QString section_name = "display_devices";
-        if (type == Sound) section_name = "dsound_devices";
-        
+        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);
+        l = loadList(&set, section_name);
         if (l.count() > 0) return l;
-        
+        #endif
+
         QRegExp rx_device("^(\\d+): (.*)");
-        
+
         if (QFile::exists("dxlist.exe")) {
                 QProcess p;
@@ -60 +64 @@
                 }
         }
-        
+
+        #ifdef CACHE_DEVICE_INFO
         saveList(&set, section_name, l);
-        
+        #endif
+
         return l;
 }
@@ -79 +85 @@
         qDebug("DeviceInfo::alsaDevices");
 
+        DeviceList l;
+
+        #ifdef CACHE_DEVICE_INFO
         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");
+        l = loadList(&set, "alsa-devices");
         if (l.count() > 0) return l;
+        #endif
 
         QRegExp rx_device("^card\\s([0-9]+).*\\[(.*)\\],\\sdevice\\s([0-9]+):");
@@ -111 +121 @@
         }
 
-        saveList(&set, "alsa_devices", l);
+        #ifdef CACHE_DEVICE_INFO
+        saveList(&set, "alsa-devices", l);
+        #endif
 
         return l;
@@ -119 +131 @@
         qDebug("DeviceInfo::xvAdaptors");
 
+        DeviceList l;
+
+        #ifdef CACHE_DEVICE_INFO
         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");
+        l = loadList(&set, "xv-adaptors");
         if (l.count() > 0) return l;
+        #endif
 
         QRegExp rx_device("^.*Adaptor #([0-9]+): \"(.*)\"");
@@ -149 +165 @@
         }
 
-        saveList(&set, "xv_adaptors", l);
+        #ifdef CACHE_DEVICE_INFO
+        saveList(&set, "xv-adaptors", l);
+        #endif
 
         return l;
@@ -156 +174 @@
 #endif
 
+#ifdef CACHE_DEVICE_INFO
 void DeviceInfo::saveList(QSettings * set, const QString & section_name, const DeviceList & list) {
         set->beginWriteArray(section_name);
@@ -161 +180 @@
                 set->setArrayIndex(i);
                 set->setValue("ID", list.at(i).ID());
-                set->setValue("password", list.at(i).desc());
+                set->setValue("description", list.at(i).desc());
         }
         set->endArray();
@@ -173 +192 @@
                 set->setArrayIndex(i);
                 QVariant id = set->value("ID");
-                QString desc = set->value("password", "").toString();
+                QString desc = set->value("description", "").toString();
                 l.append(DeviceData(id, desc));
         }
@@ -181 +200 @@
         return l;
 }
+#endif