diff options
Diffstat (limited to 'Ryujinx.Audio.Renderer/Server')
| -rw-r--r-- | Ryujinx.Audio.Renderer/Server/AudioRenderSystem.cs | 20 | ||||
| -rw-r--r-- | Ryujinx.Audio.Renderer/Server/AudioRendererManager.cs | 12 |
2 files changed, 20 insertions, 12 deletions
diff --git a/Ryujinx.Audio.Renderer/Server/AudioRenderSystem.cs b/Ryujinx.Audio.Renderer/Server/AudioRenderSystem.cs index 30f326a6..a5925284 100644 --- a/Ryujinx.Audio.Renderer/Server/AudioRenderSystem.cs +++ b/Ryujinx.Audio.Renderer/Server/AudioRenderSystem.cs @@ -31,7 +31,7 @@ using Ryujinx.Audio.Renderer.Server.Voice; using Ryujinx.Audio.Renderer.Utils; using Ryujinx.Common; using Ryujinx.Common.Logging; -using Ryujinx.Cpu; +using Ryujinx.Memory; using System; using System.Buffers; using System.Diagnostics; @@ -87,7 +87,7 @@ namespace Ryujinx.Audio.Renderer.Server private Memory<byte> _performanceBuffer; - public MemoryManager MemoryManager { get; private set; } + public IVirtualMemoryManager MemoryManager { get; private set; } private ulong _elapsedFrameCount; private ulong _renderingStartTick; @@ -96,14 +96,14 @@ namespace Ryujinx.Audio.Renderer.Server public AudioRenderSystem(AudioRendererManager manager, IWritableEvent systemEvent) { - _manager = manager; - _terminationEvent = new ManualResetEvent(false); + _manager = manager; + _terminationEvent = new ManualResetEvent(false); _dspMemoryPoolState = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); - _voiceContext = new VoiceContext(); - _mixContext = new MixContext(); - _sinkContext = new SinkContext(); - _splitterContext = new SplitterContext(); - _effectContext = new EffectContext(); + _voiceContext = new VoiceContext(); + _mixContext = new MixContext(); + _sinkContext = new SinkContext(); + _splitterContext = new SplitterContext(); + _effectContext = new EffectContext(); _commandProcessingTimeEstimator = null; _systemEvent = systemEvent; @@ -113,7 +113,7 @@ namespace Ryujinx.Audio.Renderer.Server _sessionId = 0; } - public ResultCode Initialize(ref AudioRendererConfiguration parameter, uint processHandle, CpuAddress workBuffer, ulong workBufferSize, int sessionId, ulong appletResourceId, MemoryManager memoryManager) + public ResultCode Initialize(ref AudioRendererConfiguration parameter, uint processHandle, CpuAddress workBuffer, ulong workBufferSize, int sessionId, ulong appletResourceId, IVirtualMemoryManager memoryManager) { if (!BehaviourContext.CheckValidRevision(parameter.Revision)) { diff --git a/Ryujinx.Audio.Renderer/Server/AudioRendererManager.cs b/Ryujinx.Audio.Renderer/Server/AudioRendererManager.cs index 023dd477..3df0ab31 100644 --- a/Ryujinx.Audio.Renderer/Server/AudioRendererManager.cs +++ b/Ryujinx.Audio.Renderer/Server/AudioRendererManager.cs @@ -19,7 +19,7 @@ using Ryujinx.Audio.Renderer.Dsp; using Ryujinx.Audio.Renderer.Integration; using Ryujinx.Audio.Renderer.Parameter; using Ryujinx.Common.Logging; -using Ryujinx.Cpu; +using Ryujinx.Memory; using System; using System.Diagnostics; using System.Threading; @@ -288,7 +288,7 @@ namespace Ryujinx.Audio.Renderer.Server /// <param name="workBufferSize">The guest work buffer size.</param> /// <param name="processHandle">The process handle of the application.</param> /// <returns>A <see cref="ResultCode"/> reporting an error or a success.</returns> - public ResultCode OpenAudioRenderer(out AudioRenderSystem renderer, MemoryManager memoryManager, ref AudioRendererConfiguration parameter, ulong appletResourceUserId, ulong workBufferAddress, ulong workBufferSize, uint processHandle) + public ResultCode OpenAudioRenderer(out AudioRenderSystem renderer, IVirtualMemoryManager memoryManager, ref AudioRendererConfiguration parameter, ulong appletResourceUserId, ulong workBufferAddress, ulong workBufferSize, uint processHandle) { int sessionId = AcquireSessionId(); @@ -321,6 +321,14 @@ namespace Ryujinx.Audio.Renderer.Server { if (disposing) { + lock (_audioProcessorLock) + { + if (_isRunning) + { + StopLocked(); + } + } + Processor.Dispose(); foreach (HardwareDevice device in OutputDevices) |