diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-04 19:38:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-04 19:38:30 +0300 |
| commit | 2bf01f80edc28ec998cab0adf3b20e9e7f7f0c4e (patch) | |
| tree | 359f25aa46d16b04ce679deeda959cc5654aeb59 /indra/newview | |
| parent | 854bed5c171c75c97df7e58286f2350879e5c0be (diff) | |
| parent | f649f7ab2308047dc4a8ca3cbc331aed957543ff (diff) | |
Merge pull request #1265 from makidoll/pipewire-linux-volume-catcher
Add PipeWire as option for Linux volume catcher
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 85f2b2d303..6424ae7da5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4920,6 +4920,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>MediaPluginPipeWireVolumeCatcher</key> + <map> + <key>Comment</key> + <string>Use PipeWire instead of PulseAudio for controlling web media volume.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>MediaControlFadeTime</key> <map> <key>Comment</key> diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index c4f3479204..c8b7a9c29b 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1765,6 +1765,11 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging"); media_source->enableMediaPluginDebugging( media_plugin_debugging_enabled || clean_browser); +#if LL_LINUX + bool media_plugin_pipewire_volume_catcher = gSavedSettings.getBOOL("MediaPluginPipeWireVolumeCatcher"); + media_source->enablePipeWireVolumeCatcher( media_plugin_pipewire_volume_catcher ); +#endif + // need to set agent string here before instance created media_source->setBrowserUserAgent(LLViewerMedia::getInstance()->getCurrentUserAgent()); |