diff options
| author | sharmander <saldabain.dev@gmail.com> | 2021-12-23 11:33:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-23 13:33:56 -0300 |
| commit | cb43cc7e322014ce2bd0ee73b06d403be62fa8d5 (patch) | |
| tree | 98dbdc73e947b94d04c5e12bf7dba80f93407e2c /Ryujinx.Audio/Backends/CompatLayer | |
| parent | e7c2dc8ec3329d50a52c36efeb31019850ce6015 (diff) | |
UI - Add Volume Controls + Mute Toggle (F2) (#2871)
* Add the ability to toggle mute in the status bar.
* Add the ability to toggle mute in the status bar.
* Formatting fixes
* Add hotkey (F2) to mute
* Add default hotkey to config.json
* Add ability to change volume via slider.
* Fix Headless
* Fix SDL2 Problem : Credits to d3xMachina
* Remove unnecessary work
* Address gdk comments
* Toggling with Hotkey now properly restores volume to original level.
* Toggling with Hotkey now properly restores volume to original level.
* Update UI to show Volume % instead of Muted/Unmuted
* Clean up the volume ui a bit.
* Undo unintentionally committed code.
* Implement AudRen Support
* Restore intiial volume level in function definition.
* Finalize UI
* Finalize UI
* Use clamp for bounds check
* Use Math.Clamp for volume in soundio
* Address comments by gdkchan
* Address remaining comments
* Fix missing semicolon
* Address remaining gdkchan comment
* Fix comment
* Change /* to //
* Allow volume slider to change volume immediately.
Also force label text to cast to int to prevent decimals from showing in status bar
* Remove blank line
* Undo setting of volume level when "Cancel" is pressed.
* Fix allignment for settings window code
Diffstat (limited to 'Ryujinx.Audio/Backends/CompatLayer')
| -rw-r--r-- | Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs b/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs index 0ae6a620..d9e170c3 100644 --- a/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs +++ b/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs @@ -68,7 +68,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer }; } - public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount) + public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume) { if (channelCount == 0) { @@ -80,6 +80,8 @@ namespace Ryujinx.Audio.Backends.CompatLayer sampleRate = Constants.TargetSampleRate; } + volume = Math.Clamp(volume, 0, 1); + if (!_realDriver.SupportsDirection(direction)) { if (direction == Direction.Input) @@ -94,7 +96,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer uint hardwareChannelCount = SelectHardwareChannelCount(channelCount); - IHardwareDeviceSession realSession = _realDriver.OpenDeviceSession(direction, memoryManager, sampleFormat, sampleRate, hardwareChannelCount); + IHardwareDeviceSession realSession = _realDriver.OpenDeviceSession(direction, memoryManager, sampleFormat, sampleRate, hardwareChannelCount, volume); if (hardwareChannelCount == channelCount) { |