Removed LibVlc folder check. Successfully tested on Kubuntu and MacOS

radiolondra · Apr 2, 2022 · 72340f8 · 72340f8
1 parent dba5683
commit 72340f8
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/AvaVLCControl/AvaVLCControl/ViewModels/PlayerControlModel.cs b/AvaVLCControl/AvaVLCControl/ViewModels/PlayerControlModel.cs
@@ -1,4 +1,6 @@
-using LibVLCSharp.Shared;
+using Avalonia;
+using Avalonia.Platform;
+using LibVLCSharp.Shared;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -18,8 +20,17 @@ public PlayerControlModel()
         {
             if (!Avalonia.Controls.Design.IsDesignMode)
             {
-                var libVlcDirectoryPath = Path.Combine(Environment.CurrentDirectory, "libvlc", IsWin64() ? "win-x64" : "win-x86");
-                Core.Initialize(libVlcDirectoryPath);
+                var os = AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem;
+                //if (os == OperatingSystemType.WinNT)
+                //{
+                //    var libVlcDirectoryPath = Path.Combine(Environment.CurrentDirectory, "libvlc", IsWin64() ? "win-x64" : "win-x86");
+                //    Core.Initialize(libVlcDirectoryPath);
+                //}
+                //else
+                {
+                    Core.Initialize();
+                }
+
 
                 _libVLC = new LibVLC(
                     enableDebugLogs: true