Merge branch 'main' into 2026.02

3 files changed, 4 insertions, 9 deletions

diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index a815b1cf4f..236e117aa7 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -37,8 +37,7 @@ if (LINUX)
   include(FindPipeWire)
   include_directories(SYSTEM ${PIPEWIRE_INCLUDE_DIRS} ${SPA_INCLUDE_DIRS})
   
-  #message( "Building with Linux volume catcher for PipeWire and PulseAudio" )
-  message( "Building with Linux volume catcher for PulseAudio" )
+  message( "Building with Linux volume catcher for PipeWire and PulseAudio" )
 
   list(APPEND media_plugin_cef_HEADER_FILES
     linux/volume_catcher_linux.h
@@ -47,7 +46,7 @@ if (LINUX)
   set(LINUX_VOLUME_CATCHER 
     linux/volume_catcher_linux.cpp 
     linux/volume_catcher_pulseaudio.cpp
-    #linux/volume_catcher_pipewire.cpp
+    linux/volume_catcher_pipewire.cpp 
   )
 
   list(APPEND media_plugin_cef_SOURCE_FILES ${LINUX_VOLUME_CATCHER})
@@ -72,8 +71,6 @@ add_library(media_plugin_cef
     ${media_plugin_cef_SOURCE_FILES}
     )
 
-#target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1)
-
 #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();
diff --git a/indra/media_plugins/cef/linux/volume_catcher_pipewire.cpp b/indra/media_plugins/cef/linux/volume_catcher_pipewire.cpp
index 27fea547c9..04bbbcff6c 100755
--- a/indra/media_plugins/cef/linux/volume_catcher_pipewire.cpp
+++ b/indra/media_plugins/cef/linux/volume_catcher_pipewire.cpp
@@ -207,7 +207,7 @@ void VolumeCatcherPipeWire::ChildNode::updateVolume()
 
     {
         std::lock_guard pwLock(*mImpl);
-        pw_node_set_param(mProxy, SPA_PARAM_Props, 0, pod);
+        pw_node_set_param((pw_node*)mProxy, SPA_PARAM_Props, 0, pod);
     }
 }
 
@@ -303,7 +303,7 @@ void VolumeCatcherPipeWire::handleRegistryEventGlobal(
     childNode->mProxy = proxy;
     childNode->mImpl = this;
 
-    pw_node_add_listener(proxy, &childNode->mNodeListener, &NODE_EVENTS, childNode);
+    pw_node_add_listener((pw_node*)proxy, &childNode->mNodeListener, &NODE_EVENTS, childNode);
     llpw_proxy_add_listener(proxy, &childNode->mProxyListener, &PROXY_EVENTS, childNode);
 }