Enable USE_MPV_PULSE_DEVICES

rvenz2 · Dec 23, 2021 · cf38379 · cf38379
1 parent 8e60202
commit cf38379
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/baseguiplus.cpp b/src/baseguiplus.cpp
@@ -1153,7 +1153,7 @@ void BaseGuiPlus::updateSendAudioMenu() {
  connect(a, SIGNAL(triggered()), this, SLOT(sendAudioClicked()));
  sendAudio_menu->addAction(a);
 
-#if USE_PULSEAUDIO_DEVICES
+#if USE_PULSEAUDIO_DEVICES && !USE_MPV_PULSE_DEVICES
  addListToSendAudioMenu( DeviceInfo::paDevices(), "pulse");
 #endif
 
@@ -1176,7 +1176,7 @@ void BaseGuiPlus::updateSendAudioMenu() {
  #endif
 
  #if USE_MPV_PULSE_DEVICES
- addListToSendAudioMenu( DeviceInfo::mpvPulseDevices(), "pulse");
+ addListToSendAudioMenu( DeviceInfo::pulseDevices(), "pulse");
  #endif
 
  #if USE_MPV_WASAPI_DEVICES

diff --git a/src/deviceinfo.cpp b/src/deviceinfo.cpp
@@ -151,6 +151,19 @@ DeviceList DeviceInfo::displayDevices() {
 
 // Linux
 
+#if USE_PULSEAUDIO_DEVICES || USE_MPV_PULSE_DEVICES
+DeviceList DeviceInfo::pulseDevices() {
+ DeviceList pa;
+ #if USE_PULSEAUDIO_DEVICES
+ pa = paDevices();
+ #endif
+ #if USE_MPV_PULSE_DEVICES
+ if (pa.isEmpty()) pa = mpvPulseDevices();
+ #endif
+ return pa;
+}
+#endif
+
 #if USE_PULSEAUDIO_DEVICES
 DeviceList DeviceInfo::paDevices() {
  qDebug("DeviceInfo::paDevices");

diff --git a/src/deviceinfo.h b/src/deviceinfo.h
@@ -29,7 +29,7 @@
 #else
 #define USE_ALSA_DEVICES 0
 #define USE_MPV_ALSA_DEVICES 0
-#define USE_MPV_PULSE_DEVICES 0
+#define USE_MPV_PULSE_DEVICES 1
 #define USE_PULSEAUDIO_DEVICES 1
 #define USE_XV_ADAPTORS 1
 #endif
@@ -73,6 +73,10 @@ class DeviceInfo {
  static DeviceList dsoundDevices();
  static DeviceList displayDevices();
 #else
+ #if USE_PULSEAUDIO_DEVICES || USE_MPV_PULSE_DEVICES
+ static DeviceList pulseDevices();
+ #endif
+
  #if USE_PULSEAUDIO_DEVICES
  static DeviceList paDevices();
  #endif

diff --git a/src/prefgeneral.cpp b/src/prefgeneral.cpp
@@ -70,11 +70,11 @@ PrefGeneral::PrefGeneral(QWidget * parent, Qt::WindowFlags f)
 #if USE_MPV_ALSA_DEVICES
  mpv_alsa_devices = DeviceInfo::mpvAlsaDevices();
 #endif
-#if USE_PULSEAUDIO_DEVICES
+#if USE_PULSEAUDIO_DEVICES && !USE_MPV_PULSE_DEVICES
  pa_devices = DeviceInfo::paDevices();
 #endif
 #if USE_MPV_PULSE_DEVICES
- pa_devices = DeviceInfo::mpvPulseDevices();
+ pa_devices = DeviceInfo::pulseDevices();
 #endif
 #if USE_XV_ADAPTORS
  xv_adaptors = DeviceInfo::xvAdaptors();