Allows the library to work even when the system does not have any aud…

…io devices or audio service is disabled
SuRGeoNix · Nov 18, 2021 · c9a936d · c9a936d
1 parent 8eb7387
commit c9a936d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/FlyleafLib/AudioMaster.cs b/FlyleafLib/AudioMaster.cs
@@ -54,6 +54,11 @@ public string       Device
             }
         }
 
+        /// <summary>
+        /// Whether no audio devices were found or audio failed to initialize
+        /// </summary>
+        public bool         Failed              { get; private set; }
+
         /// <summary>
         /// Gets or sets the master's volume (valid values 0 - 100)
         /// </summary>
@@ -113,10 +118,17 @@ public void Initialize()
                 foreach(var player in Master.Players.Values)
                     player.InitializeAudio();
 
-                if (Device == DefaultDeviceName)
-                    device = deviceEnum.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
-                else
-                    device = deviceEnum.GetDevice(DeviceId);
+                try
+                {
+                    if (Device == DefaultDeviceName)
+                        device = deviceEnum.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+                    else
+                        device = deviceEnum.GetDevice(DeviceId);
+                } catch (Exception)
+                {
+                    Failed = true;
+                    return;
+                }
 
                 device.AudioEndpointVolume.OnVolumeNotification += OnMasterVolumeChanged;
                 device.AudioSessionManager.OnSessionCreated += (o, newSession) =>

diff --git a/FlyleafLib/FlyleafLib.xml b/FlyleafLib/FlyleafLib.xml
diff --git a/FlyleafLib/MediaPlayer/AudioPlayer.cs b/FlyleafLib/MediaPlayer/AudioPlayer.cs
@@ -130,6 +130,8 @@ public AudioPlayer(Config config)
         }
         internal void InitializeAudio(int sampleRate = -1)
         {
+            if (Master.AudioMaster.Failed) { Config.Audio.Enabled = false; return; }
+
             lock (lockerAudioPlayer)
             {
                 if (sampleRate != -1)