mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-12-25 16:05:47 +00:00
cb43cc7e32
* Add the ability to toggle mute in the status bar. * Add the ability to toggle mute in the status bar. * Formatting fixes * Add hotkey (F2) to mute * Add default hotkey to config.json * Add ability to change volume via slider. * Fix Headless * Fix SDL2 Problem : Credits to d3xMachina * Remove unnecessary work * Address gdk comments * Toggling with Hotkey now properly restores volume to original level. * Toggling with Hotkey now properly restores volume to original level. * Update UI to show Volume % instead of Muted/Unmuted * Clean up the volume ui a bit. * Undo unintentionally committed code. * Implement AudRen Support * Restore intiial volume level in function definition. * Finalize UI * Finalize UI * Use clamp for bounds check * Use Math.Clamp for volume in soundio * Address comments by gdkchan * Address remaining comments * Fix missing semicolon * Address remaining gdkchan comment * Fix comment * Change /* to // * Allow volume slider to change volume immediately. Also force label text to cast to int to prevent decimals from showing in status bar * Remove blank line * Undo setting of volume level when "Cancel" is pressed. * Fix allignment for settings window code
162 lines
6.7 KiB
C#
162 lines
6.7 KiB
C#
using Ryujinx.Audio.Common;
|
|
using Ryujinx.Common;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Cpu;
|
|
using Ryujinx.HLE.HOS.Services.Audio.AudioOut;
|
|
using System.Text;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Audio
|
|
{
|
|
[Service("audout:u")]
|
|
class AudioOutManagerServer : IpcService
|
|
{
|
|
private const int AudioOutNameSize = 0x100;
|
|
|
|
private IAudioOutManager _impl;
|
|
|
|
public AudioOutManagerServer(ServiceCtx context) : this(context, new AudioOutManager(context.Device.System.AudioOutputManager)) { }
|
|
|
|
public AudioOutManagerServer(ServiceCtx context, IAudioOutManager impl) : base(context.Device.System.AudOutServer)
|
|
{
|
|
_impl = impl;
|
|
}
|
|
|
|
[CommandHipc(0)]
|
|
// ListAudioOuts() -> (u32, buffer<bytes, 6>)
|
|
public ResultCode ListAudioOuts(ServiceCtx context)
|
|
{
|
|
string[] deviceNames = _impl.ListAudioOuts();
|
|
|
|
ulong position = context.Request.ReceiveBuff[0].Position;
|
|
ulong size = context.Request.ReceiveBuff[0].Size;
|
|
|
|
ulong basePosition = position;
|
|
|
|
int count = 0;
|
|
|
|
foreach (string name in deviceNames)
|
|
{
|
|
byte[] buffer = Encoding.ASCII.GetBytes(name);
|
|
|
|
if ((position - basePosition) + (ulong)buffer.Length > size)
|
|
{
|
|
Logger.Error?.Print(LogClass.ServiceAudio, $"Output buffer size {size} too small!");
|
|
|
|
break;
|
|
}
|
|
|
|
context.Memory.Write(position, buffer);
|
|
MemoryHelper.FillWithZeros(context.Memory, position + (ulong)buffer.Length, AudioOutNameSize - buffer.Length);
|
|
|
|
position += AudioOutNameSize;
|
|
count++;
|
|
}
|
|
|
|
context.ResponseData.Write(count);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[CommandHipc(1)]
|
|
// OpenAudioOut(AudioOutInputConfiguration input_config, nn::applet::AppletResourceUserId, pid, handle<copy, process> process_handle, buffer<bytes, 5> name_in)
|
|
// -> (AudioOutInputConfiguration output_config, object<nn::audio::detail::IAudioOut>, buffer<bytes, 6> name_out)
|
|
public ResultCode OpenAudioOut(ServiceCtx context)
|
|
{
|
|
AudioInputConfiguration inputConfiguration = context.RequestData.ReadStruct<AudioInputConfiguration>();
|
|
ulong appletResourceUserId = context.RequestData.ReadUInt64();
|
|
|
|
ulong deviceNameInputPosition = context.Request.SendBuff[0].Position;
|
|
ulong deviceNameInputSize = context.Request.SendBuff[0].Size;
|
|
|
|
ulong deviceNameOutputPosition = context.Request.ReceiveBuff[0].Position;
|
|
ulong deviceNameOutputSize = context.Request.ReceiveBuff[0].Size;
|
|
|
|
uint processHandle = (uint)context.Request.HandleDesc.ToCopy[0];
|
|
|
|
string inputDeviceName = MemoryHelper.ReadAsciiString(context.Memory, deviceNameInputPosition, (long)deviceNameInputSize);
|
|
|
|
ResultCode resultCode = _impl.OpenAudioOut(context, out string outputDeviceName, out AudioOutputConfiguration outputConfiguration, out IAudioOut obj, inputDeviceName, ref inputConfiguration, appletResourceUserId, processHandle, context.Device.Configuration.AudioVolume);
|
|
|
|
if (resultCode == ResultCode.Success)
|
|
{
|
|
context.ResponseData.WriteStruct(outputConfiguration);
|
|
|
|
byte[] outputDeviceNameRaw = Encoding.ASCII.GetBytes(outputDeviceName);
|
|
|
|
context.Memory.Write(deviceNameOutputPosition, outputDeviceNameRaw);
|
|
MemoryHelper.FillWithZeros(context.Memory, deviceNameOutputPosition + (ulong)outputDeviceNameRaw.Length, AudioOutNameSize - outputDeviceNameRaw.Length);
|
|
|
|
MakeObject(context, new AudioOutServer(obj));
|
|
}
|
|
|
|
return resultCode;
|
|
}
|
|
|
|
[CommandHipc(2)] // 3.0.0+
|
|
// ListAudioOutsAuto() -> (u32, buffer<bytes, 0x22>)
|
|
public ResultCode ListAudioOutsAuto(ServiceCtx context)
|
|
{
|
|
string[] deviceNames = _impl.ListAudioOuts();
|
|
|
|
(ulong position, ulong size) = context.Request.GetBufferType0x22();
|
|
|
|
ulong basePosition = position;
|
|
|
|
int count = 0;
|
|
|
|
foreach (string name in deviceNames)
|
|
{
|
|
byte[] buffer = Encoding.ASCII.GetBytes(name);
|
|
|
|
if ((position - basePosition) + (ulong)buffer.Length > size)
|
|
{
|
|
Logger.Error?.Print(LogClass.ServiceAudio, $"Output buffer size {size} too small!");
|
|
|
|
break;
|
|
}
|
|
|
|
context.Memory.Write(position, buffer);
|
|
MemoryHelper.FillWithZeros(context.Memory, position + (ulong)buffer.Length, AudioOutNameSize - buffer.Length);
|
|
|
|
position += AudioOutNameSize;
|
|
count++;
|
|
}
|
|
|
|
context.ResponseData.Write(count);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[CommandHipc(3)] // 3.0.0+
|
|
// OpenAudioOut(AudioOutInputConfiguration input_config, nn::applet::AppletResourceUserId, pid, handle<copy, process> process_handle, buffer<bytes, 0x21> name_in)
|
|
// -> (AudioOutInputConfiguration output_config, object<nn::audio::detail::IAudioOut>, buffer<bytes, 0x22> name_out)
|
|
public ResultCode OpenAudioOutAuto(ServiceCtx context)
|
|
{
|
|
AudioInputConfiguration inputConfiguration = context.RequestData.ReadStruct<AudioInputConfiguration>();
|
|
ulong appletResourceUserId = context.RequestData.ReadUInt64();
|
|
|
|
(ulong deviceNameInputPosition, ulong deviceNameInputSize) = context.Request.GetBufferType0x21();
|
|
(ulong deviceNameOutputPosition, ulong deviceNameOutputSize) = context.Request.GetBufferType0x22();
|
|
|
|
uint processHandle = (uint)context.Request.HandleDesc.ToCopy[0];
|
|
|
|
string inputDeviceName = MemoryHelper.ReadAsciiString(context.Memory, deviceNameInputPosition, (long)deviceNameInputSize);
|
|
|
|
ResultCode resultCode = _impl.OpenAudioOut(context, out string outputDeviceName, out AudioOutputConfiguration outputConfiguration, out IAudioOut obj, inputDeviceName, ref inputConfiguration, appletResourceUserId, processHandle, context.Device.Configuration.AudioVolume);
|
|
|
|
if (resultCode == ResultCode.Success)
|
|
{
|
|
context.ResponseData.WriteStruct(outputConfiguration);
|
|
|
|
byte[] outputDeviceNameRaw = Encoding.ASCII.GetBytes(outputDeviceName);
|
|
|
|
context.Memory.Write(deviceNameOutputPosition, outputDeviceNameRaw);
|
|
MemoryHelper.FillWithZeros(context.Memory, deviceNameOutputPosition + (ulong)outputDeviceNameRaw.Length, AudioOutNameSize - outputDeviceNameRaw.Length);
|
|
|
|
MakeObject(context, new AudioOutServer(obj));
|
|
}
|
|
|
|
return resultCode;
|
|
}
|
|
}
|
|
}
|