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/Output/AudioOutputManager.cs | |
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/Output/AudioOutputManager.cs')
-rw-r--r-- | Ryujinx.Audio/Output/AudioOutputManager.cs | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/Ryujinx.Audio/Output/AudioOutputManager.cs b/Ryujinx.Audio/Output/AudioOutputManager.cs index 852632fa..dd115295 100644 --- a/Ryujinx.Audio/Output/AudioOutputManager.cs +++ b/Ryujinx.Audio/Output/AudioOutputManager.cs @@ -208,13 +208,14 @@ namespace Ryujinx.Audio.Output SampleFormat sampleFormat, ref AudioInputConfiguration parameter, ulong appletResourceUserId, - uint processHandle) + uint processHandle, + float volume) { int sessionId = AcquireSessionId(); _sessionsBufferEvents[sessionId].Clear(); - IHardwareDeviceSession deviceSession = _deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, memoryManager, sampleFormat, parameter.SampleRate, parameter.ChannelCount); + IHardwareDeviceSession deviceSession = _deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, memoryManager, sampleFormat, parameter.SampleRate, parameter.ChannelCount, volume); AudioOutputSystem audioOut = new AudioOutputSystem(this, _lock, deviceSession, _sessionsBufferEvents[sessionId]); @@ -247,6 +248,41 @@ namespace Ryujinx.Audio.Output return result; } + /// <summary> + /// Sets the volume for all output devices. + /// </summary> + /// <param name="volume">The volume to set.</param> + public void SetVolume(float volume) + { + if (_sessions != null) + { + foreach (AudioOutputSystem session in _sessions) + { + session?.SetVolume(volume); + } + } + } + + /// <summary> + /// Gets the volume for all output devices. + /// </summary> + /// <returns>A float indicating the volume level.</returns> + public float GetVolume() + { + if (_sessions != null) + { + foreach (AudioOutputSystem session in _sessions) + { + if (session != null) + { + return session.GetVolume(); + } + } + } + + return 0.0f; + } + public void Dispose() { if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0) |