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

Timestamp:

Jan 24, 2017, 12:41:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/deviceinfo.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -22 +22 @@
 #include <QFile>
 #include <QSettings>
+
 
 #ifdef Q_OS_WIN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 DeviceList DeviceInfo::retrieveDevices(DeviceType type) {
@@ -71 +138 @@
         return l;
 }
+
 
 DeviceList DeviceInfo::dsoundDevices() { 
@@ -82 +150 @@
 #else
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 DeviceList DeviceInfo::alsaDevices() {
         qDebug("DeviceInfo::alsaDevices");
@@ -127 +243 @@
         return l;
 }
-
+#endif
+
+#ifdef USE_XV_ADAPTORS
 DeviceList DeviceInfo::xvAdaptors() {
         qDebug("DeviceInfo::xvAdaptors");
@@ -171 +289 @@
         return l;
 }
-
+#endif
+#endif
+
+#if MPV_AUDIO_DEVICES
+QString DeviceInfo::mpv_bin;
+
+#if USE_MPV_ALSA_DEVICES
+DeviceList DeviceInfo::mpvAlsaDevices() {
+        static DeviceList l;
+        if (!l.isEmpty()) return l;
+        l = mpvAudioDevices("alsa");
+        return l;
+}
+#endif
+
+#if USE_MPV_WASAPI_DEVICES
+DeviceList DeviceInfo::mpvWasapiDevices() {
+        static DeviceList l;
+        if (!l.isEmpty()) return l;
+        l = mpvAudioDevices("wasapi");
+        return l;
+}
+#endif
+        
+DeviceList DeviceInfo::mpvAudioDevices(const QString & filter) {
+        DeviceList l;
+        if (!mpv_bin.isEmpty()) l = mpvAudioDevices(mpv_bin, filter);
+        return l;
+}
+
+DeviceList DeviceInfo::mpvAudioDevices(const QString & mpv_bin, const QString & filter) {
+        qDebug("DeviceInfo::mpvAudioDevices");
+
+        DeviceList l;
+
+        QRegExp rx("'" + filter + "\\/(.*)'\\s+\\((.*)\\)");
+
+        QProcess p;
+        p.setProcessChannelMode( QProcess::MergedChannels );
+
+        p.start(mpv_bin, QStringList() << "--audio-device=help");
+
+        QString device;
+        QString name;
+        //int index = 0;
+
+        if (p.waitForFinished()) {
+                QString line;
+                while (p.canReadLine()) {
+                        line = QString::fromUtf8(p.readLine().trimmed());
+                        qDebug() << "DeviceInfo::mpvAudioDevices:" << line;
+
+                        if (rx.indexIn(line) > -1 ) {
+                                device = rx.cap(1);
+                                name = rx.cap(2);
+                                qDebug() << "DeviceInfo::mpvAudioDevices: device:" << device << "name:" << name;
+                                l.append( DeviceData(device, name) );
+                                //index++;
+                        }
+                }
+        }
+
+        return l;
+}
 #endif
 
@@ -201 +382 @@
 }
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+