aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Core
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2018-03-12 16:29:06 -0300
committergdkchan <gab.dark.100@gmail.com>2018-03-12 16:29:06 -0300
commitd88b5c762143d42367b9cbcdb48337db482dbed3 (patch)
tree80c8aab8b8f01d3a936146367a3c49005fe5b0dc /Ryujinx.Core
parente32f27158fa314492af35800eb0c84ca0e7b5bd4 (diff)
Fix GetAudioRenderersProcessMasterVolume which was totally wrong
Diffstat (limited to 'Ryujinx.Core')
-rw-r--r--Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs63
-rw-r--r--Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs13
2 files changed, 71 insertions, 5 deletions
diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs b/Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs
new file mode 100644
index 00000000..9ebf140a
--- /dev/null
+++ b/Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs
@@ -0,0 +1,63 @@
+using ChocolArm64.Memory;
+using Ryujinx.Core.OsHle.Ipc;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ryujinx.Core.OsHle.IpcServices.Aud
+{
+ class IAudioDevice : IIpcService
+ {
+ private Dictionary<int, ServiceProcessRequest> m_Commands;
+
+ public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
+
+ public IAudioDevice()
+ {
+ m_Commands = new Dictionary<int, ServiceProcessRequest>()
+ {
+ { 0, ListAudioDeviceName },
+ { 1, SetAudioDeviceOutputVolume },
+ };
+ }
+
+ public long ListAudioDeviceName(ServiceCtx Context)
+ {
+ string[] Names = new string[] { "FIXME" };
+
+ Context.ResponseData.Write(Names.Length);
+
+ long Position = Context.Request.ReceiveBuff[0].Position;
+ long Size = Context.Request.ReceiveBuff[0].Size;
+
+ long BasePosition = Position;
+
+ foreach (string Name in Names)
+ {
+ byte[] Buffer = Encoding.ASCII.GetBytes(Name + '\0');
+
+ if ((Position - BasePosition) + Buffer.Length > Size)
+ {
+ break;
+ }
+
+ AMemoryHelper.WriteBytes(Context.Memory, Position, Buffer);
+
+ Position += Buffer.Length;
+ }
+
+ return 0;
+ }
+
+ public long SetAudioDeviceOutputVolume(ServiceCtx Context)
+ {
+ float Volume = Context.RequestData.ReadSingle();
+
+ long Position = Context.Request.SendBuff[0].Position;
+ long Size = Context.Request.SendBuff[0].Size;
+
+ string Name = AMemoryHelper.ReadAsciiString(Context.Memory, Position, (int)Size);
+
+ return 0;
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs b/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs
index 15bda04c..155d0425 100644
--- a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs
+++ b/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Core.OsHle.Handles;
using Ryujinx.Core.OsHle.Ipc;
using System.Collections.Generic;
@@ -15,9 +16,9 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
- { 0, OpenAudioRenderer },
- { 1, GetAudioRendererWorkBufferSize },
- { 2, GetAudioRenderersProcessMasterVolume }
+ { 0, OpenAudioRenderer },
+ { 1, GetAudioRendererWorkBufferSize },
+ { 2, GetAudioDevice }
};
}
@@ -49,9 +50,11 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
return 0;
}
- public long GetAudioRenderersProcessMasterVolume(ServiceCtx Context)
+ public long GetAudioDevice(ServiceCtx Context)
{
- Context.ResponseData.Write(0);
+ long UserId = Context.RequestData.ReadInt64();
+
+ MakeObject(Context, new IAudioDevice());
return 0;
}