Revert "Exempt Tumbleweed from PipeWire"

This reverts commit 2170cca3a9f205bc6dda9d1b084ff5c8821186c9.

2 files changed, 0 insertions, 11 deletions

diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 06c47d423c..236e117aa7 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -49,11 +49,6 @@ if (LINUX)
     linux/volume_catcher_pipewire.cpp 
   )
 
-  if (NOT (${LINUX_DISTRO} MATCHES ubuntu))
-    message( "Building with Linux volume catcher for PulseAudio only and cancelling PipeWire" )
-    list(REMOVE_ITEM LINUX_VOLUME_CATCHER linux/volume_catcher_pipewire.cpp)
-  endif ()
-
   list(APPEND media_plugin_cef_SOURCE_FILES ${LINUX_VOLUME_CATCHER})
   set(CMAKE_SHARED_LINKER_FLAGS  "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'")
   list(APPEND media_plugin_cef_LINK_LIBRARIES llwindow )
@@ -76,10 +71,6 @@ add_library(media_plugin_cef
     ${media_plugin_cef_SOURCE_FILES}
     )
 
-if (${LINUX_DISTRO} MATCHES ubuntu)
-    target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1)
-endif ()
-
 #add_dependencies(media_plugin_cef
 #  ${MEDIA_PLUGIN_BASE_LIBRARIES}
 #)
diff --git a/indra/media_plugins/cef/linux/volume_catcher_linux.cpp b/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
index ba2ed1aa56..7d33242063 100644
--- a/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
+++ b/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
@@ -37,14 +37,12 @@ void VolumeCatcher::onEnablePipeWireVolumeCatcher(bool enable)
     if (pimpl != nullptr)
         return;
 
-#if USE_VOLUME_CATCHER_PW
     if (enable)
     {
         LL_DEBUGS() << "volume catcher using pipewire" << LL_ENDL;
         pimpl = new VolumeCatcherPipeWire();
     }
     else
-#endif
     {
         LL_DEBUGS() << "volume catcher using pulseaudio" << LL_ENDL;
         pimpl = new VolumeCatcherPulseAudio();