aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Audio/Renderers
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Audio/Renderers')
-rw-r--r--Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs2
-rw-r--r--Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs10
-rw-r--r--Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs1
3 files changed, 8 insertions, 5 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()
diff --git a/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs b/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs
index eb6caa60..92bf42c4 100644
--- a/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs
+++ b/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs
@@ -1,6 +1,5 @@
using Ryujinx.Audio.SoundIo;
using SoundIOSharp;
-using System;
using System.Collections.Generic;
namespace Ryujinx.Audio