Merge branch 'master' of https://github.com/LiuYunPlayer/TuneLab

LiuYunPlayer · Jun 13, 2024 · adbb4a5 · adbb4a5
2 parents 5d46d48 + 63d1e8b
commit adbb4a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/TuneLab/Audio/SDL2/SDLAudioEngine.cs b/TuneLab/Audio/SDL2/SDLAudioEngine.cs
@@ -110,7 +110,7 @@ public void Play()
         // 如果没有打开音频设备那么打开第一个音频设备
         if (_d.curDevId == 0)
         {
-            SwitchDevice(0);
+            SwitchDevice(-1);
         }
 
         _d.start();
@@ -154,12 +154,11 @@ public void SwitchDevice(int deviceNumber)
             return;
         }
 
-        _d.devNum = deviceNumber;
-
         // 打开音频设备
         uint id;
+        string? deviceToOpen = deviceNumber < 0 ? null : SDL.SDL_GetAudioDeviceName(deviceNumber, 0);
         if ((id = SDL.SDL_OpenAudioDevice(
-                SDL.SDL_GetAudioDeviceName(_d.devNum, 0),
+                deviceToOpen,
                 0,
                 ref _d.spec,
                 out _,
@@ -168,7 +167,14 @@ public void SwitchDevice(int deviceNumber)
             throw new IOException($"SDLPlayback: Failed to open audio device: {SDL.SDL_GetError()}.");
         }
 
-        Console.WriteLine($"SDLPlayback: {SDL.SDL_GetAudioDeviceName(_d.devNum, 0)}");
+        if (deviceToOpen == null)
+        {
+            Console.WriteLine($"SDLPlayback: Current Device");
+        }
+        else
+        {
+            Console.WriteLine($"SDLPlayback: {deviceToOpen}");
+        }
 
         _d.setDevId(id);
     }

diff --git a/TuneLab/Audio/SDL2/SDLPlaybackData.cs b/TuneLab/Audio/SDL2/SDLPlaybackData.cs
@@ -25,8 +25,6 @@ public enum PlaybackState
     // 播放信息
     public string driver = "";
 
-    public int devNum = -1;
-
     public PlaybackState state = PlaybackState.Stopped;
 
     public ISampleProvider? sampleProvider = null;