Merge branch 'develop' into rlva/base

1 files changed, 8 insertions, 7 deletions

diff --git a/indra/media_plugins/cef/volume_catcher.h b/indra/media_plugins/cef/volume_catcher.h
index ea97a24947..6933854e8e 100644
--- a/indra/media_plugins/cef/volume_catcher.h
+++ b/indra/media_plugins/cef/volume_catcher.h
@@ -35,19 +35,20 @@ class VolumeCatcherImpl;
 
 class VolumeCatcher
 {
- public:
+public:
     VolumeCatcher();
     ~VolumeCatcher();
 
-    void setVolume(F32 volume); // 0.0 - 1.0
-
-    // Set the left-right pan of audio sources
-    // where -1.0 = left, 0 = center, and 1.0 = right
+    void setVolume(F32 volume);
     void setPan(F32 pan);
 
-    void pump(); // call this at least a few times a second if you can - it affects how quickly we can 'catch' a new audio source and adjust its volume
+    void pump();
+
+#if LL_LINUX
+    void onEnablePipeWireVolumeCatcher(bool enable);
+#endif
 
- private:
+private:
     VolumeCatcherImpl *pimpl;
 };