From 86252dd7d4bb7e7100b434ac642cbb3682165bfb Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Mon, 18 May 2026 18:50:53 +0800
Subject: Revert "Exempt Tumbleweed from PipeWire"

This reverts commit 2170cca3a9f205bc6dda9d1b084ff5c8821186c9.
---
 indra/media_plugins/cef/linux/volume_catcher_linux.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/media_plugins/cef/linux')

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();
-- 
cgit v1.3


From 2fe2f3c1736eb52126b5cc340dc474692d99a817 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Mon, 18 May 2026 19:34:32 +0800
Subject: Building with Linux volume catcher for PipeWire again

and use PipeWire instead of PulseAudio for controlling web media
volume by default.
---
 indra/media_plugins/cef/linux/volume_catcher_pipewire.cpp | 4 ++--
 indra/newview/app_settings/settings.xml                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/media_plugins/cef/linux')

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);
 }
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3648a40412..e7c2e718ab 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5138,7 +5138,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>0</integer>
+    <integer>1</integer>
   </map>
   <key>MediaControlFadeTime</key>
   <map>
-- 
cgit v1.3