1 files changed, 24 insertions, 21 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 4ef2b0957e..065aa4605a 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -24,27 +24,30 @@ set(media_plugin_cef_HEADER_FILES
 
 # Select which VolumeCatcher implementation to use
 if (LINUX)
-  # off by default. we should keep using pulse for now
-  set(USE_VOLUME_CATCHER_PW OFF CACHE BOOL "Use PipeWire for CEF volume catching")
-
-  if (USE_VOLUME_CATCHER_PW)
-    include(FindPipeWire)
-    include_directories(SYSTEM ${PIPEWIRE_INCLUDE_DIRS} ${SPA_INCLUDE_DIRS})
-    message( "Building with Linux volume catcher using PipeWire" )
-    set(LINUX_VOLUME_CATCHER linux_volume_catcher_pw.cpp)
-  else (USE_VOLUME_CATCHER_PW)
-    foreach( PULSE_FILE pulse/introspect.h pulse/context.h pulse/subscribe.h pulse/glib-mainloop.h )
-      find_path( PULSE_FILE_${PULSE_FILE}_FOUND ${PULSE_FILE} NO_CACHE)
-      if( NOT PULSE_FILE_${PULSE_FILE}_FOUND )
-        message( "Looking for ${PULSE_FILE} ... not found")
-        message( FATAL_ERROR "Pulse header not found" )
-      else()
-        message( "Looking for ${PULSE_FILE} ... found")
-      endif()
-    endforeach()
-    message( "Building with Linux volume catcher using PulseAudio" )
-    set(LINUX_VOLUME_CATCHER linux_volume_catcher_pa.cpp)
-  endif (USE_VOLUME_CATCHER_PW)
+  foreach( PULSE_FILE pulse/introspect.h pulse/context.h pulse/subscribe.h pulse/glib-mainloop.h )
+    find_path( PULSE_FILE_${PULSE_FILE}_FOUND ${PULSE_FILE} NO_CACHE)
+    if( NOT PULSE_FILE_${PULSE_FILE}_FOUND )
+      message( "Looking for ${PULSE_FILE} ... not found")
+      message( FATAL_ERROR "Pulse header not found" )
+    else()
+      message( "Looking for ${PULSE_FILE} ... found")
+    endif()
+  endforeach()
+  
+  include(FindPipeWire)
+  include_directories(SYSTEM ${PIPEWIRE_INCLUDE_DIRS} ${SPA_INCLUDE_DIRS})
+  
+  message( "Building with Linux volume catcher for PipeWire and PulseAudio" )
+
+  list(APPEND media_plugin_cef_HEADER_FILES
+    linux/volume_catcher_linux.h
+  )
+
+  set(LINUX_VOLUME_CATCHER 
+    linux/volume_catcher_linux.cpp 
+    linux/volume_catcher_pulseaudio.cpp
+    linux/volume_catcher_pipewire.cpp 
+  )
 
   list(APPEND media_plugin_cef_SOURCE_FILES ${LINUX_VOLUME_CATCHER})
   set(CMAKE_SHARED_LINKER_FLAGS  "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'")