manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2024-11-15 09:35:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement ListAudioOutsAuto & OpenAudioOutAuto

Browse source
This commit is contained in:
greggameplayer 2018-06-15 17:24:02 +02:00
parent 76f3b1b3a4
commit 4397049c6a
1 changed files with 91 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs
View file

@ -20,32 +20,16 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {
{ 0, ListAudioOuts }, { 0, ListAudioOuts },
{ 1, OpenAudioOut } { 1, OpenAudioOut },
{ 2, ListAudioOutsAuto },
{ 3, OpenAudioOutAuto }
}; };
} }
public long ListAudioOuts(ServiceCtx Context) public long ListAudioOuts(ServiceCtx Context)
{ {
long Position = Context.Request.ReceiveBuff[0].Position; ListAudioOutsMethod(Context, Context.Request.ReceiveBuff[0].Position, Context.Request.ReceiveBuff[0].Size);
long Size = Context.Request.ReceiveBuff[0].Size;
int NameCount = 0;
byte[] DeviceNameBuffer = Encoding.ASCII.GetBytes(DefaultAudioOutput + "\0");
if ((ulong)DeviceNameBuffer.Length <= (ulong)Size)
{
Context.Memory.WriteBytes(Position, DeviceNameBuffer);
NameCount++;
}
else
{
Context.Ns.Log.PrintError(LogClass.ServiceAudio, $"Output buffer size {Size} too small!");
}
Context.ResponseData.Write(NameCount);
return 0; return 0;
} }
@ -57,7 +41,8 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
string DeviceName = AMemoryHelper.ReadAsciiString( string DeviceName = AMemoryHelper.ReadAsciiString(
Context.Memory, Context.Memory,
Context.Request.SendBuff[0].Position, Context.Request.SendBuff[0].Position,
Context.Request.SendBuff[0].Size); Context.Request.SendBuff[0].Size
);
if (DeviceName == string.Empty) if (DeviceName == string.Empty)
{ {
@ -78,6 +63,7 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
Context.Ns.Log.PrintError(LogClass.ServiceAudio, $"Output buffer size {Size} too small!"); Context.Ns.Log.PrintError(LogClass.ServiceAudio, $"Output buffer size {Size} too small!");
} }
int SampleRate = Context.RequestData.ReadInt32(); int SampleRate = Context.RequestData.ReadInt32();
int Channels = Context.RequestData.ReadInt32(); int Channels = Context.RequestData.ReadInt32();
@ -111,5 +97,83 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
return 0; return 0;
} }
public long ListAudioOutsAuto(ServiceCtx Context)
{
ListAudioOutsMethod(Context, Context.Request.GetBufferType0x22().Position, Context.Request.GetBufferType0x22().Size);
return 0;
}
public long OpenAudioOutAuto(ServiceCtx Context)
{
IAalOutput AudioOut = Context.Ns.AudioOut;
string DeviceName = AMemoryHelper.ReadAsciiString(
Context.Memory,
Context.Request.GetBufferType0x21().Position,
Context.Request.GetBufferType0x21().Size
);
if (DeviceName == string.Empty)
{
DeviceName = DefaultAudioOutput;
}
long Position = Context.Request.GetBufferType0x22().Position;
long Size = Context.Request.GetBufferType0x22().Size;
byte[] DeviceNameBuffer = Encoding.ASCII.GetBytes(DeviceName + "\0");
if ((ulong)DeviceNameBuffer.Length <= (ulong)Size)
{
Context.Memory.WriteBytes(Position, DeviceNameBuffer);
}
else
{
Context.Ns.Log.PrintError(LogClass.ServiceAudio, $"Output buffer size {Size} too small!");
}
int AudioParams1 = Context.RequestData.ReadInt32();
int AudioParams2 = Context.RequestData.ReadInt32();
int AudioParams3 = Context.RequestData.ReadInt32();
int AudioParams4 = Context.RequestData.ReadInt32();
KEvent ReleaseEvent = new KEvent();
ReleaseCallback Callback = () =>
{
ReleaseEvent.WaitEvent.Set();
};
//TODO: add makeobject (object currently unknown)
Context.ResponseData.Write(AudioParams1);
Context.ResponseData.Write(AudioParams2);
return 0;
}
public long ListAudioOutsMethod(ServiceCtx Context, long Position, long Size)
{
int NameCount = 0;
byte[] DeviceNameBuffer = Encoding.ASCII.GetBytes(DefaultAudioOutput + "\0");
if ((ulong)DeviceNameBuffer.Length <= (ulong)Size)
{
Context.Memory.WriteBytes(Position, DeviceNameBuffer);
NameCount++;
}
else
{
Context.Ns.Log.PrintError(LogClass.ServiceAudio, $"Output buffer size {Size} too small!");
}
Context.ResponseData.Write(NameCount);
return 0;
}
} }
} }