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

Timestamp:

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

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/deviceinfo.cpp (modified) (8 diffs)

smplayer/vendor/current/src/deviceinfo.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 
 #include "deviceinfo.h"
+
 #include <QProcess>
 #include <QFile>
+
 
 #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 @@
         }
         
+
+
         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 @@
         }
 
+
+
         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 @@
         }
 
+
+
         return l;
 }
 
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+