diff options
| author | Ac_K <Acoustik666@gmail.com> | 2020-11-27 20:55:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 20:55:00 +0100 |
| commit | 7b66cb0d9051cab581df6853f11e87ed115da6c3 (patch) | |
| tree | 7f5903f298f54cd65d16461089722d8f20264e11 /Ryujinx.Audio/Renderers/OpenAL | |
| parent | 0108004691a582f7df8e629c1e68a6bb0e0b90e7 (diff) | |
audio: Cleanup Ryujinx.Audio and fix OpenAL issue (#1746)
* audio: Cleanup SoundIO and fix OpenAL issue
* fix tabs by spaces
* Fix extra spaces
* Fix SoundIO.cs
* Fix ContainsAudioOutBuffer
Diffstat (limited to 'Ryujinx.Audio/Renderers/OpenAL')
| -rw-r--r-- | Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs b/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs index abad0f17..1ad82319 100644 --- a/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs +++ b/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs @@ -367,7 +367,7 @@ namespace Ryujinx.Audio { lock (track) { - return track.Volume; + return track.GetVolume(); } } diff --git a/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs b/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs index 6e016713..690129eb 100644 --- a/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs +++ b/Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs @@ -11,7 +11,6 @@ namespace Ryujinx.Audio public int SampleRate { get; private set; } public ALFormat Format { get; private set; } public PlaybackState State { get; set; } - public float Volume { get; private set; } public int HardwareChannels { get; } public int VirtualChannels { get; } @@ -151,9 +150,14 @@ namespace Ryujinx.Audio public void SetVolume(float volume) { - Volume = volume; + AL.Source(SourceId, ALSourcef.Gain, volume); + } + + public float GetVolume() + { + AL.GetSource(SourceId, ALSourcef.Gain, out float volume); - AL.Source(SourceId, ALSourcef.Gain, Volume); + return volume; } public void Dispose() |