From 5e6726d411d3d5cd2fa67a6e30f8198a98ba501c Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 1 Jan 2024 14:52:01 -0500 Subject: [PATCH] wrap in windows check for now, only supported on windows --- Client/Music/MusicPlayer.cs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Client/Music/MusicPlayer.cs b/Client/Music/MusicPlayer.cs index 3eb0a0681..63c2b6702 100644 --- a/Client/Music/MusicPlayer.cs +++ b/Client/Music/MusicPlayer.cs @@ -5,6 +5,7 @@ using NLog; using System; using System.IO; +using System.Runtime.InteropServices; using System.Threading; namespace Helion.Client.Music; @@ -62,13 +63,18 @@ public bool Play(byte[] data, MusicPlayerOptions options) m_musicPlayer = CreateFluidSynthPlayer(); data = converted; } - else if (NAudioMusicPlayer.IsOgg(data)) + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - m_musicPlayer = new NAudioMusicPlayer(NAudioMusicType.Ogg); - } - else if (NAudioMusicPlayer.IsMp3(data)) - { - m_musicPlayer = new NAudioMusicPlayer(NAudioMusicType.Mp3); + // Ogg/mp3 currently only works in Windows + if (NAudioMusicPlayer.IsOgg(data)) + { + m_musicPlayer = new NAudioMusicPlayer(NAudioMusicType.Ogg); + } + else if (NAudioMusicPlayer.IsMp3(data)) + { + m_musicPlayer = new NAudioMusicPlayer(NAudioMusicType.Mp3); + } + } else if (MusToMidi.TryConvertNoHeader(data, out converted)) {