From 9563f50118f9b24518d8124605f7c2b4045381fc Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 18 May 2026 18:48:52 +0800 Subject: Revert "Remove the word Pipewire from config message for now" This reverts commit 6c1ff2e4b9da8069b9da573f99b52df707e97e75. --- indra/media_plugins/cef/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index a815b1cf4f..502be8774b 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 -- cgit v1.3 From 54e1494fda4976626897c3de5e6148655ddb8895 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 18 May 2026 18:49:04 +0800 Subject: Revert "Exempt Ubuntu from Pipewire too" This reverts commit b8cc57486f3c15fd40d3524204c7fc0db3b7b8d4. --- indra/media_plugins/cef/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 502be8774b..06c47d423c 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -46,9 +46,14 @@ 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 ) + 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 ) @@ -71,7 +76,9 @@ add_library(media_plugin_cef ${media_plugin_cef_SOURCE_FILES} ) -#target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1) +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} -- cgit v1.3 From 86252dd7d4bb7e7100b434ac642cbb3682165bfb Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 18 May 2026 18:50:53 +0800 Subject: Revert "Exempt Tumbleweed from PipeWire" This reverts commit 2170cca3a9f205bc6dda9d1b084ff5c8821186c9. --- indra/media_plugins/cef/CMakeLists.txt | 9 --------- indra/media_plugins/cef/linux/volume_catcher_linux.cpp | 2 -- 2 files changed, 11 deletions(-) (limited to 'indra/media_plugins') 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(); -- cgit v1.3 From 2fe2f3c1736eb52126b5cc340dc474692d99a817 Mon Sep 17 00:00:00 2001 From: Erik Kundiman 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') 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 @@ Type Boolean Value - 0 + 1 MediaControlFadeTime -- cgit v1.3