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/Integration | |
| 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/Integration')
| -rw-r--r-- | Ryujinx.Audio/Integration/HardwareDeviceImpl.cs | 14 | ||||
| -rw-r--r-- | Ryujinx.Audio/Integration/IHardwareDevice.cs | 12 | ||||
| -rw-r--r-- | Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs | 2 |
3 files changed, 25 insertions, 3 deletions
diff --git a/Ryujinx.Audio/Integration/HardwareDeviceImpl.cs b/Ryujinx.Audio/Integration/HardwareDeviceImpl.cs index d489b008..d51aa3fb 100644 --- a/Ryujinx.Audio/Integration/HardwareDeviceImpl.cs +++ b/Ryujinx.Audio/Integration/HardwareDeviceImpl.cs @@ -30,9 +30,9 @@ namespace Ryujinx.Audio.Integration private byte[] _buffer; - public HardwareDeviceImpl(IHardwareDeviceDriver deviceDriver, uint channelCount, uint sampleRate) + public HardwareDeviceImpl(IHardwareDeviceDriver deviceDriver, uint channelCount, uint sampleRate, float volume) { - _session = deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, null, SampleFormat.PcmInt16, sampleRate, channelCount); + _session = deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, null, SampleFormat.PcmInt16, sampleRate, channelCount, volume); _channelCount = channelCount; _sampleRate = sampleRate; _currentBufferTag = 0; @@ -56,6 +56,16 @@ namespace Ryujinx.Audio.Integration _currentBufferTag = _currentBufferTag % 4; } + public void SetVolume(float volume) + { + _session.SetVolume(volume); + } + + public float GetVolume() + { + return _session.GetVolume(); + } + public uint GetChannelCount() { return _channelCount; diff --git a/Ryujinx.Audio/Integration/IHardwareDevice.cs b/Ryujinx.Audio/Integration/IHardwareDevice.cs index 0f67b2c8..1eeb5ca4 100644 --- a/Ryujinx.Audio/Integration/IHardwareDevice.cs +++ b/Ryujinx.Audio/Integration/IHardwareDevice.cs @@ -26,6 +26,18 @@ namespace Ryujinx.Audio.Integration public interface IHardwareDevice : IDisposable { /// <summary> + /// Sets the volume level for this device. + /// </summary> + /// <param name="volume">The volume level to set.</param> + void SetVolume(float volume); + + /// <summary> + /// Gets the volume level for this device. + /// </summary> + /// <returns>The volume level of this device.</returns> + float GetVolume(); + + /// <summary> /// Get the supported sample rate of this device. /// </summary> /// <returns>The supported sample rate of this device.</returns> diff --git a/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs b/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs index 1a53fa9b..c1869ce1 100644 --- a/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs +++ b/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs @@ -33,7 +33,7 @@ namespace Ryujinx.Audio.Integration Output } - IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount); + IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume = 1f); ManualResetEvent GetUpdateRequiredEvent(); ManualResetEvent GetPauseEvent(); |
