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
172 lines
5.2 KiB
C#
172 lines
5.2 KiB
C#
using Ryujinx.Audio.Common;
|
|
using Ryujinx.Audio.Integration;
|
|
using Ryujinx.Memory;
|
|
using Ryujinx.SDL2.Common;
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Runtime.InteropServices;
|
|
using System.Threading;
|
|
|
|
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
|
|
using static SDL2.SDL;
|
|
|
|
namespace Ryujinx.Audio.Backends.SDL2
|
|
{
|
|
public class SDL2HardwareDeviceDriver : IHardwareDeviceDriver
|
|
{
|
|
private readonly ManualResetEvent _updateRequiredEvent;
|
|
private readonly ManualResetEvent _pauseEvent;
|
|
private readonly ConcurrentDictionary<SDL2HardwareDeviceSession, byte> _sessions;
|
|
|
|
public SDL2HardwareDeviceDriver()
|
|
{
|
|
_updateRequiredEvent = new ManualResetEvent(false);
|
|
_pauseEvent = new ManualResetEvent(true);
|
|
_sessions = new ConcurrentDictionary<SDL2HardwareDeviceSession, byte>();
|
|
|
|
SDL2Driver.Instance.Initialize();
|
|
}
|
|
|
|
public static bool IsSupported => IsSupportedInternal();
|
|
|
|
private static bool IsSupportedInternal()
|
|
{
|
|
uint device = OpenStream(SampleFormat.PcmInt16, Constants.TargetSampleRate, Constants.ChannelCountMax, Constants.TargetSampleCount, null);
|
|
|
|
if (device != 0)
|
|
{
|
|
SDL_CloseAudioDevice(device);
|
|
}
|
|
|
|
return device != 0;
|
|
}
|
|
|
|
public ManualResetEvent GetUpdateRequiredEvent()
|
|
{
|
|
return _updateRequiredEvent;
|
|
}
|
|
|
|
public ManualResetEvent GetPauseEvent()
|
|
{
|
|
return _pauseEvent;
|
|
}
|
|
|
|
public IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume)
|
|
{
|
|
if (channelCount == 0)
|
|
{
|
|
channelCount = 2;
|
|
}
|
|
|
|
if (sampleRate == 0)
|
|
{
|
|
sampleRate = Constants.TargetSampleRate;
|
|
}
|
|
|
|
if (direction != Direction.Output)
|
|
{
|
|
throw new NotImplementedException("Input direction is currently not implemented on SDL2 backend!");
|
|
}
|
|
|
|
SDL2HardwareDeviceSession session = new SDL2HardwareDeviceSession(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
|
|
|
|
_sessions.TryAdd(session, 0);
|
|
|
|
return session;
|
|
}
|
|
|
|
internal bool Unregister(SDL2HardwareDeviceSession session)
|
|
{
|
|
return _sessions.TryRemove(session, out _);
|
|
}
|
|
|
|
private static SDL_AudioSpec GetSDL2Spec(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, uint sampleCount)
|
|
{
|
|
return new SDL_AudioSpec
|
|
{
|
|
channels = (byte)requestedChannelCount,
|
|
format = GetSDL2Format(requestedSampleFormat),
|
|
freq = (int)requestedSampleRate,
|
|
samples = (ushort)sampleCount
|
|
};
|
|
}
|
|
|
|
internal static ushort GetSDL2Format(SampleFormat format)
|
|
{
|
|
return format switch
|
|
{
|
|
SampleFormat.PcmInt8 => AUDIO_S8,
|
|
SampleFormat.PcmInt16 => AUDIO_S16,
|
|
SampleFormat.PcmInt32 => AUDIO_S32,
|
|
SampleFormat.PcmFloat => AUDIO_F32,
|
|
_ => throw new ArgumentException($"Unsupported sample format {format}"),
|
|
};
|
|
}
|
|
|
|
internal static uint OpenStream(SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, uint sampleCount, SDL_AudioCallback callback)
|
|
{
|
|
SDL_AudioSpec desired = GetSDL2Spec(requestedSampleFormat, requestedSampleRate, requestedChannelCount, sampleCount);
|
|
|
|
desired.callback = callback;
|
|
|
|
uint device = SDL_OpenAudioDevice(IntPtr.Zero, 0, ref desired, out SDL_AudioSpec got, 0);
|
|
|
|
if (device == 0)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
bool isValid = got.format == desired.format && got.freq == desired.freq && got.channels == desired.channels;
|
|
|
|
if (!isValid)
|
|
{
|
|
SDL_CloseAudioDevice(device);
|
|
|
|
return 0;
|
|
}
|
|
|
|
return device;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Dispose(true);
|
|
}
|
|
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
foreach (SDL2HardwareDeviceSession session in _sessions.Keys)
|
|
{
|
|
session.Dispose();
|
|
}
|
|
|
|
SDL2Driver.Instance.Dispose();
|
|
|
|
_pauseEvent.Dispose();
|
|
}
|
|
}
|
|
|
|
public bool SupportsSampleRate(uint sampleRate)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public bool SupportsSampleFormat(SampleFormat sampleFormat)
|
|
{
|
|
return sampleFormat != SampleFormat.PcmInt24;
|
|
}
|
|
|
|
public bool SupportsChannelCount(uint channelCount)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public bool SupportsDirection(Direction direction)
|
|
{
|
|
// TODO: add direction input when supported.
|
|
return direction == Direction.Output;
|
|
}
|
|
}
|
|
}
|