- GUI imporvments.

- Bug fixes. - Conversion performance improvments.
RazTools · Oct 24, 2024 · 932522a · 932522a
1 parent 1df3ef6
commit 932522a
Show file tree

Hide file tree

Showing 33 changed files with 805 additions and 731 deletions.
diff --git a/Audio.GUI.Desktop/Audio.GUI.Desktop.csproj b/Audio.GUI.Desktop/Audio.GUI.Desktop.csproj
@@ -13,13 +13,14 @@
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+  <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win'))">
 	<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.21" />
 
     <VlcWindowsX64IncludeFiles Include="libvlc.dll" />
     <VlcWindowsX64IncludeFiles Include="libvlccore.dll" />
     <VlcWindowsX64IncludeFiles Include="plugins\access\libimem_plugin.dll" />
     <VlcWindowsX64IncludeFiles Include="plugins\audio_filter\libaudio_format_plugin.dll" />
+  	<VlcWindowsX64IncludeFiles Include="plugins\audio_filter\libugly_resampler_plugin.dll" />
     <VlcWindowsX64IncludeFiles Include="plugins\audio_filter\libtrivial_channel_mixer_plugin.dll" />
     <VlcWindowsX64IncludeFiles Include="plugins\audio_output\libmmdevice_plugin.dll" />
     <VlcWindowsX64IncludeFiles Include="plugins\audio_output\libwasapi_plugin.dll" />
@@ -31,6 +32,7 @@
     <VlcWindowsX86IncludeFiles Include="libvlccore.dll" />
     <VlcWindowsX86IncludeFiles Include="plugins\access\libimem_plugin.dll" />
     <VlcWindowsX86IncludeFiles Include="plugins\audio_filter\libaudio_format_plugin.dll" />
+  	<VlcWindowsX86IncludeFiles Include="plugins\audio_filter\libugly_resampler_plugin.dll" />
     <VlcWindowsX86IncludeFiles Include="plugins\audio_filter\libtrivial_channel_mixer_plugin.dll" />
     <VlcWindowsX86IncludeFiles Include="plugins\audio_output\libmmdevice_plugin.dll" />
     <VlcWindowsX86IncludeFiles Include="plugins\audio_output\libwasapi_plugin.dll" />
@@ -39,7 +41,7 @@
     <VlcWindowsX86IncludeFiles Include="plugins\codec\liboggspots_plugin.dll" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+  <ItemGroup Condition="$(RuntimeIdentifier.Contains('osx'))">
   	<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3.1" />
   </ItemGroup>
 

diff --git a/Audio.GUI/Audio.GUI.csproj b/Audio.GUI/Audio.GUI.csproj
@@ -29,8 +29,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Controls\VLCPlayer.axaml.cs">
-      <DependentUpon>VLCPlayer.axaml</DependentUpon>
+    <Compile Update="Views\PlayerView.axaml.cs">
+      <DependentUpon>PlayerView.axaml</DependentUpon>
     </Compile>
     <Compile Update="Views\EntryView.axaml.cs">
       <DependentUpon>EntryView.axaml</DependentUpon>

diff --git a/Audio.GUI/Behaviours/FileDropBehaviour.cs b/Audio.GUI/Behaviours/FileDropBehaviour.cs
@@ -0,0 +1,45 @@
+using Audio.GUI.ViewModels;
+using Avalonia.Input;
+using Avalonia.Platform.Storage;
+using Avalonia.Xaml.Interactions.DragAndDrop;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Audio.GUI.Behaviours;
+public class FileDropBehaviour : DropHandlerBase
+{
+    public override bool Execute(object? sender, DragEventArgs e, object? sourceContext, object? targetContext, object? state)
+    {
+        if (targetContext is MainViewModel mainViewModel)
+        {
+            List<string> files = [];
+
+            foreach(IStorageItem? storageItem in e.Data.GetFiles() ?? [])
+            {
+                string? path = storageItem.TryGetLocalPath();
+                if (!string.IsNullOrWhiteSpace(path))
+                {
+                    if (Directory.Exists(path))
+                    {
+                        files.AddRange(Directory.GetFiles(path, "*.*", SearchOption.AllDirectories));
+                    }
+                    else if (File.Exists(path))
+                    {
+                        files.Add(path);
+                    }
+                }
+            }
+
+            _ = mainViewModel.LoadFiles(files);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public override bool Validate(object? sender, DragEventArgs e, object? sourceContext, object? targetContext, object? state)
+    {
+        return targetContext is MainViewModel && e.Data.Contains(DataFormats.Files);
+    }
+}
diff --git a/Audio.GUI/Behaviours/ScrollToEndOnCollectionChangedBehaviour.cs b/Audio.GUI/Behaviours/ScrollToEndOnCollectionChangedBehaviour.cs
diff --git a/Audio.GUI/Controls/VLCPlayer.axaml.cs b/Audio.GUI/Controls/VLCPlayer.axaml.cs
diff --git a/Audio.GUI/Models/EntryTreeNode.cs b/Audio.GUI/Models/EntryTreeNode.cs
@@ -31,6 +31,7 @@ public override bool HasMatch(string? searchText)
             {
                 foreach (KeyValuePair<FNVID<uint>, HashSet<EventTag>> evt in uintTag.Events)
                 {
+                    match |= regex.IsMatch(evt.Key.ToString());
                     foreach (EventTag tag in evt.Value)
                     {
                         match |= regex.IsMatch(tag.Type.ToString());

diff --git a/Audio.GUI/ViewModels/EntryViewModel.cs b/Audio.GUI/ViewModels/EntryViewModel.cs
@@ -3,17 +3,26 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace Audio.GUI.ViewModels;
 
 public partial class EntryViewModel : ViewModelBase
 {
+    private readonly PlayerViewModel _playerViewModel;
+
     [ObservableProperty]
     private string infoText = "";
 
     [ObservableProperty]
     private Entry? entry;
 
+    public PlayerViewModel PlayerViewModel => _playerViewModel;
+
+    public EntryViewModel()
+    {
+        _playerViewModel = new();
+    }
     partial void OnEntryChanged(Entry? value)
     {
         if (value != null)
@@ -39,6 +48,7 @@ partial void OnEntryChanged(Entry? value)
             }
 
             InfoText = sb.ToString();
+            Task.Run(() => _playerViewModel.LoadAudio(value));
         }
     }
 }