Add PulseAudio support for auto-switch

Author: timschneeb

src/audio/pulseaudio/PulseAudioService.cpp

@@ -1,6 +1,7 @@
 #include "PulsePipelineManager.h"
 
 #include "PulseAudioService.h"
+#include "PulseDevice.h"
 
 #include "PulseAppManager.h"
 #include "Utils.h"
@@ -42,6 +43,8 @@ PulseAudioService::PulseAudioService()
 
     /* Register sink change handler */
     mgr.get()->getPulseManager()->sink_changed.connect([&](const std::shared_ptr<mySinkInfo>& info) {
+        sinks[info->index] = *info;
+
         if (info->name == mgr.get()->getPulseManager()->server_info.default_sink_name) {
             Glib::signal_timeout().connect_seconds_once(
                         [=]() {
@@ -61,7 +64,7 @@ PulseAudioService::PulseAudioService()
 
                         if (dev_name != last_sink_dev_name) {
                             last_sink_dev_name = dev_name;
-                            emit outputDeviceChanged(QString::fromStdString(dev_name), QString::fromStdString(dev_name));
+                            emit outputDeviceChanged(QString::fromStdString(current_info->description), QString::fromStdString(current_info->name));
                         }
                     }
                 }
@@ -70,6 +73,14 @@ PulseAudioService::PulseAudioService()
         }
     });
 
+    mgr.get()->getPulseManager()->sink_added.connect([&](const std::shared_ptr<mySinkInfo>& info) {
+        sinks[info->index] = *info;
+    });
+    mgr.get()->getPulseManager()->sink_removed.connect([&](uint id) {
+        sinks.erase(id);
+    });
+
+
     /* Launch audio processing thread */
     apt = new PulseAudioProcessingThread(mgr);
     apt->start();
@@ -121,7 +132,12 @@ IAppManager *PulseAudioService::appManager()
 
 std::vector<IOutputDevice> PulseAudioService::sinkDevices()
 {
-    return std::vector<IOutputDevice>();
+    std::vector<IOutputDevice> devices;
+    for(const auto& [id, sink] : sinks)
+    {
+        devices.push_back(PulseDevice(sink));
+    }
+    return devices;
 }
 
 DspStatus PulseAudioService::status()

src/audio/pulseaudio/PulseAudioService.h

@@ -37,6 +37,7 @@ public slots:
     PulseAudioProcessingThread* apt;
 
     std::string last_sink_dev_name;
+    std::map<uint, mySinkInfo> sinks;
 
 };
 

src/audio/pulseaudio/PulseDevice.cpp

@@ -0,0 +1,8 @@
+#include "PulseDevice.h"
+
+PulseDevice::PulseDevice(const mySinkInfo &info)
+{
+    id = info.index;
+    name = info.name;
+    description = info.description;
+}

src/audio/pulseaudio/PulseDevice.h

@@ -0,0 +1,14 @@
+#ifndef PULSEDEVICE_H
+#define PULSEDEVICE_H
+
+#include "PulseDataTypes.h"
+
+#include <IOutputDevice.h>
+
+class PulseDevice : public IOutputDevice
+{
+public:
+    PulseDevice(const mySinkInfo& info);
+};
+
+#endif // PULSEDEVICE_H

src/audio/pulseaudio/PulseaudioCore.pri

@@ -4,6 +4,7 @@ SOURCES +=  \
     $$PWD/PulseAppManager.cpp \
     $$PWD/PulseAudioProcessingThread.cpp \
     $$PWD/PulseAudioService.cpp \
+    $$PWD/PulseDevice.cpp \
     $$PWD/PulseManager.cpp \
     $$PWD/PulsePipelineManager.cpp \
     $$PWD/RealtimeKit.cpp \
@@ -20,6 +21,7 @@ HEADERS +=  \
     $$PWD/PulseAudioProcessingThread.h \
     $$PWD/PulseAudioService.h \
     $$PWD/PulseDataTypes.h \
+    $$PWD/PulseDevice.h \
     $$PWD/PulseManager.h \
     $$PWD/PulsePipelineManager.h \
     $$PWD/RealtimeKit.h \

src/config/AppConfig.cpp

@@ -38,7 +38,7 @@ AppConfig::AppConfig()
     DEFINE_KEY(AudioOutputUseDefault, true);
     DEFINE_KEY(AudioOutputDevice, "");
     DEFINE_KEY(AudioAppBlocklist, QStringList());
-    DEFINE_KEY(AudioAppBlocklistInvert, true);
+    DEFINE_KEY(AudioAppBlocklistInvert, false);
 
     DEFINE_KEY(AeqPlotDarkMode, false);