|
|
@@ -20,32 +20,16 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
|
|
|
{
|
|
|
m_Commands = new Dictionary<int, ServiceProcessRequest>()
|
|
|
{
|
|
|
- { 0, ListAudioOuts },
|
|
|
- { 1, OpenAudioOut }
|
|
|
+ { 0, ListAudioOuts },
|
|
|
+ { 1, OpenAudioOut },
|
|
|
+ { 2, ListAudioOutsAuto },
|
|
|
+ { 3, OpenAudioOutAuto }
|
|
|
};
|
|
|
}
|
|
|
|
|
|
public long ListAudioOuts(ServiceCtx Context)
|
|
|
- {
|
|
|
- long Position = Context.Request.ReceiveBuff[0].Position;
|
|
|
- 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);
|
|
|
+ {
|
|
|
+ ListAudioOutsMethod(Context, Context.Request.ReceiveBuff[0].Position, Context.Request.ReceiveBuff[0].Size);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
@@ -53,12 +37,13 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
|
|
|
public long OpenAudioOut(ServiceCtx Context)
|
|
|
{
|
|
|
IAalOutput AudioOut = Context.Ns.AudioOut;
|
|
|
-
|
|
|
+
|
|
|
string DeviceName = AMemoryHelper.ReadAsciiString(
|
|
|
Context.Memory,
|
|
|
Context.Request.SendBuff[0].Position,
|
|
|
- Context.Request.SendBuff[0].Size);
|
|
|
-
|
|
|
+ Context.Request.SendBuff[0].Size
|
|
|
+ );
|
|
|
+
|
|
|
if (DeviceName == string.Empty)
|
|
|
{
|
|
|
DeviceName = DefaultAudioOutput;
|
|
|
@@ -76,7 +61,8 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
|
|
|
else
|
|
|
{
|
|
|
Context.Ns.Log.PrintError(LogClass.ServiceAudio, $"Output buffer size {Size} too small!");
|
|
|
- }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
int SampleRate = Context.RequestData.ReadInt32();
|
|
|
int Channels = Context.RequestData.ReadInt32();
|
|
|
@@ -111,5 +97,83 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
|
|
|
|
|
|
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;
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
+}
|