diff options
Diffstat (limited to 'Ryujinx.HLE/HOS')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs | 10 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs | 25 |
2 files changed, 9 insertions, 26 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs index eaf644f6..af9cccb2 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs @@ -85,16 +85,16 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager { long tag = context.RequestData.ReadInt64(); - context.ResponseData.Write(_audioOut.ContainsBuffer(_track, tag) ? 1 : 0); + context.ResponseData.Write(_audioOut.ContainsBuffer(_track, tag)); - return 0; + return ResultCode.Success; } [Command(7)] // 3.0.0+ // AppendAudioOutBufferAuto(u64 tag, buffer<nn::audio::AudioOutBuffer, 0x21>) public ResultCode AppendAudioOutBufferAuto(ServiceCtx context) { - (long position, long size) = context.Request.GetBufferType0x21(); + (long position, _) = context.Request.GetBufferType0x21(); return AppendAudioOutBufferImpl(context, position); } @@ -103,9 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager { long tag = context.RequestData.ReadInt64(); - AudioOutData data = MemoryHelper.Read<AudioOutData>( - context.Memory, - position); + AudioOutData data = MemoryHelper.Read<AudioOutData>(context.Memory, position); // NOTE: Assume PCM16 all the time, change if new format are found. short[] buffer = new short[data.SampleBufferSize / sizeof(short)]; diff --git a/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs b/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs index 7c27be61..646acef4 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs @@ -20,10 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio // ListAudioOuts() -> (u32 count, buffer<bytes, 6>) public ResultCode ListAudioOuts(ServiceCtx context) { - return ListAudioOutsImpl( - context, - context.Request.ReceiveBuff[0].Position, - context.Request.ReceiveBuff[0].Size); + return ListAudioOutsImpl(context, context.Request.ReceiveBuff[0].Position, context.Request.ReceiveBuff[0].Size); } [Command(1)] @@ -31,12 +28,8 @@ namespace Ryujinx.HLE.HOS.Services.Audio // -> (u32 sample_rate, u32 channel_count, u32 pcm_format, u32, object<nn::audio::detail::IAudioOut>, buffer<bytes, 6> name_out) public ResultCode OpenAudioOut(ServiceCtx context) { - return OpenAudioOutImpl( - context, - context.Request.SendBuff[0].Position, - context.Request.SendBuff[0].Size, - context.Request.ReceiveBuff[0].Position, - context.Request.ReceiveBuff[0].Size); + return OpenAudioOutImpl(context, context.Request.SendBuff[0].Position, context.Request.SendBuff[0].Size, + context.Request.ReceiveBuff[0].Position, context.Request.ReceiveBuff[0].Size); } [Command(2)] // 3.0.0+ @@ -56,12 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio (long sendPosition, long sendSize) = context.Request.GetBufferType0x21(); (long recvPosition, long recvSize) = context.Request.GetBufferType0x22(); - return OpenAudioOutImpl( - context, - sendPosition, - sendSize, - recvPosition, - recvSize); + return OpenAudioOutImpl(context, sendPosition, sendSize, recvPosition, recvSize); } private ResultCode ListAudioOutsImpl(ServiceCtx context, long position, long size) @@ -88,10 +76,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio private ResultCode OpenAudioOutImpl(ServiceCtx context, long sendPosition, long sendSize, long receivePosition, long receiveSize) { - string deviceName = MemoryHelper.ReadAsciiString( - context.Memory, - sendPosition, - sendSize); + string deviceName = MemoryHelper.ReadAsciiString(context.Memory, sendPosition, sendSize); if (deviceName == string.Empty) { |
