From 477b45be1be256b7496e1d45b41754c6e40ef58a Mon Sep 17 00:00:00 2001
From: Maki <maki@hotmilk.space>
Date: Fri, 19 Apr 2024 02:32:29 -0400
Subject: Add toggle for PipeWire volume catcher, and refactoring

---
 indra/llplugin/llpluginclassmedia.cpp | 9 +++++++++
 indra/llplugin/llpluginclassmedia.h   | 3 +++
 2 files changed, 12 insertions(+)

(limited to 'indra/llplugin')

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 3e72710366..3d87e2be7c 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -981,6 +981,15 @@ void LLPluginClassMedia::enableMediaPluginDebugging( bool enable )
 	sendMessage( message );
 }
 
+#if LL_LINUX
+void LLPluginClassMedia::enablePipeWireVolumeCatcher( bool enable )
+{
+	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_pipewire_volume_catcher");
+	message.setValueBoolean( "enable", enable );
+	sendMessage( message );
+}
+#endif
+
 void LLPluginClassMedia::setTarget(const std::string &target)
 {
 	mTarget = target;
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index ba76ae4e37..4b5ec2b76c 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -122,6 +122,9 @@ public:
 
 	// enable/disable media plugin debugging messages and info spam
 	void enableMediaPluginDebugging( bool enable );
+#if LL_LINUX
+	void enablePipeWireVolumeCatcher( bool enable );
+#endif
 
 	// Javascript <-> viewer events
 	void jsEnableObject( bool enable );
-- 
cgit v1.2.3


From bdf46af9aff96a749dcf2612a2bdc6e8e394971e Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Tue, 21 May 2024 20:52:38 -0400
Subject: fix "lines starting with tabs found"

---
 indra/llplugin/llpluginclassmedia.cpp | 6 +++---
 indra/llplugin/llpluginclassmedia.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/llplugin')

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 6e16c4d552..4e5013ec8f 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -984,9 +984,9 @@ void LLPluginClassMedia::enableMediaPluginDebugging( bool enable )
 #if LL_LINUX
 void LLPluginClassMedia::enablePipeWireVolumeCatcher( bool enable )
 {
-	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_pipewire_volume_catcher");
-	message.setValueBoolean( "enable", enable );
-	sendMessage( message );
+    LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_pipewire_volume_catcher");
+    message.setValueBoolean( "enable", enable );
+    sendMessage( message );
 }
 #endif
 
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index f4f374c894..5d2f3bbb79 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -136,7 +136,7 @@ public:
     bool textInput(const std::string &text, MASK modifiers, LLSD native_key_data);
 
 #if LL_LINUX
-	void enablePipeWireVolumeCatcher( bool enable );
+    void enablePipeWireVolumeCatcher( bool enable );
 #endif
 
     static std::string sOIDcookieUrl;
-- 
cgit v1.2.3