diff options
| author | Mary <me@thog.eu> | 2021-09-19 12:29:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 12:29:19 +0200 |
| commit | e17eb7bfafdd95084baea8e9f3dc77ee3f755347 (patch) | |
| tree | 4982e2593a279c9e2c4906ead4d1764a9ddadb54 /Ryujinx.Audio/Renderer/Device/VirtualDevice.cs | |
| parent | fe9d5a1981cfe43c4535b7473064c9858addb3b5 (diff) | |
amadeus: Update to REV10 (#2654)
* amadeus: Update to REV10
This implements all the changes made with REV10 on 13.0.0.
* Address Ack's comment
* Address gdkchan's comment
Diffstat (limited to 'Ryujinx.Audio/Renderer/Device/VirtualDevice.cs')
| -rw-r--r-- | Ryujinx.Audio/Renderer/Device/VirtualDevice.cs | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/Ryujinx.Audio/Renderer/Device/VirtualDevice.cs b/Ryujinx.Audio/Renderer/Device/VirtualDevice.cs index 29395e5c..3ec37069 100644 --- a/Ryujinx.Audio/Renderer/Device/VirtualDevice.cs +++ b/Ryujinx.Audio/Renderer/Device/VirtualDevice.cs @@ -27,12 +27,13 @@ namespace Ryujinx.Audio.Renderer.Device /// <summary> /// All the defined virtual devices. /// </summary> - public static readonly VirtualDevice[] Devices = new VirtualDevice[4] + public static readonly VirtualDevice[] Devices = new VirtualDevice[5] { - new VirtualDevice("AudioStereoJackOutput", 2), - new VirtualDevice("AudioBuiltInSpeakerOutput", 2), - new VirtualDevice("AudioTvOutput", 6), - new VirtualDevice("AudioUsbDeviceOutput", 2), + new VirtualDevice("AudioStereoJackOutput", 2, true), + new VirtualDevice("AudioBuiltInSpeakerOutput", 2, false), + new VirtualDevice("AudioTvOutput", 6, false), + new VirtualDevice("AudioUsbDeviceOutput", 2, true), + new VirtualDevice("AudioExternalOutput", 6, true), }; /// <summary> @@ -51,14 +52,21 @@ namespace Ryujinx.Audio.Renderer.Device public float MasterVolume { get; private set; } /// <summary> + /// Define if the <see cref="VirtualDevice"/> is provided by an external interface. + /// </summary> + public bool IsExternalOutput { get; } + + /// <summary> /// Create a new <see cref="VirtualDevice"/> instance. /// </summary> /// <param name="name">The name of the <see cref="VirtualDevice"/>.</param> /// <param name="channelCount">The count of channels supported by the <see cref="VirtualDevice"/>.</param> - private VirtualDevice(string name, uint channelCount) + /// <param name="isExternalOutput">Indicate if the <see cref="VirtualDevice"/> is provided by an external interface.</param> + private VirtualDevice(string name, uint channelCount, bool isExternalOutput) { Name = name; ChannelCount = channelCount; + IsExternalOutput = isExternalOutput; } /// <summary> @@ -80,5 +88,19 @@ namespace Ryujinx.Audio.Renderer.Device { return Name.Equals("AudioUsbDeviceOutput"); } + + /// <summary> + /// Get the output device name of the <see cref="VirtualDevice"/>. + /// </summary> + /// <returns>The output device name of the <see cref="VirtualDevice"/>.</returns> + public string GetOutputDeviceName() + { + if (IsExternalOutput) + { + return "AudioExternalOutput"; + } + + return Name; + } } } |
