Merge pull request stakira#1327 from stakira/splash

Adds a splash window
rokujyushi · Nov 19, 2024 · 2672d22 · 2672d22
2 parents 45f3604 + 34d075b
commit 2672d22
Show file tree

Hide file tree

Showing 8 changed files with 173 additions and 128 deletions.
diff --git a/OpenUtau.Core/DocManager.cs b/OpenUtau.Core/DocManager.cs
@@ -41,14 +41,14 @@ public class DocManager : SingletonBase<DocManager> {
         public List<UNote> NotesClipboard { get; set; }
         internal PhonemizerRunner PhonemizerRunner { get; private set; }
 
-        public void Initialize() {
+        public void Initialize(Thread mainThread, TaskScheduler mainScheduler) {
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler((sender, args) => {
                 CrashSave();
             });
             SearchAllPlugins();
             SearchAllLegacyPlugins();
-            mainThread = Thread.CurrentThread;
-            mainScheduler = TaskScheduler.FromCurrentSynchronizationContext();
+            this.mainThread = mainThread;
+            this.mainScheduler = mainScheduler;
             PhonemizerRunner = new PhonemizerRunner(mainScheduler);
         }
 

diff --git a/OpenUtau.Core/SingerManager.cs b/OpenUtau.Core/SingerManager.cs
@@ -15,44 +15,31 @@ namespace OpenUtau.Core {
     public class SingerManager : SingletonBase<SingerManager> {
         public Dictionary<string, USinger> Singers { get; private set; } = new Dictionary<string, USinger>();
         public Dictionary<USingerType, List<USinger>> SingerGroups { get; private set; } = new Dictionary<USingerType, List<USinger>>();
-        public Task? InitializationTask = null;
 
         private readonly ConcurrentQueue<USinger> reloadQueue = new ConcurrentQueue<USinger>();
         private CancellationTokenSource reloadCancellation;
-        
+
         private HashSet<USinger> singersUsed = new HashSet<USinger>();
 
         public void Initialize() {
-            InitializationTask = Task.Run(() => {
-                SearchAllSingers();
-            });
+            SearchAllSingers();
         }
 
         public void SearchAllSingers() {
-            try {
-                Log.Information("Searching singers.");
-                Directory.CreateDirectory(PathManager.Inst.SingersPath);
-                var stopWatch = Stopwatch.StartNew();
-                var singers = ClassicSingerLoader.FindAllSingers()
-                    .Concat(Vogen.VogenSingerLoader.FindAllSingers())
-                    .Distinct();
-                Singers = singers
-                    .ToLookup(s => s.Id)
-                    .ToDictionary(g => g.Key, g => g.First());
-                SingerGroups = singers
-                    .GroupBy(s => s.SingerType)
-                    .ToDictionary(s => s.Key, s => s.LocalizedOrderBy(singer => singer.LocalizedName).ToList());
-                stopWatch.Stop();
-                Log.Information($"Search all singers: {stopWatch.Elapsed}");
-            } catch (Exception e) {
-                if (InitializationTask.Status == TaskStatus.Running) {
-                    Log.Error(e, "Failed to search singers.");
-                } else {
-                    var customEx = new MessageCustomizableException("Failed to search singers.", "<translate:errors.failed.searchsinger>", e);
-                    DocManager.Inst.ExecuteCmd(new ErrorMessageNotification(customEx));
-                }
-                Singers = new Dictionary<string, USinger>();
-            }
+            Log.Information("Searching singers.");
+            Directory.CreateDirectory(PathManager.Inst.SingersPath);
+            var stopWatch = Stopwatch.StartNew();
+            var singers = ClassicSingerLoader.FindAllSingers()
+                .Concat(Vogen.VogenSingerLoader.FindAllSingers())
+                .Distinct();
+            Singers = singers
+                .ToLookup(s => s.Id)
+                .ToDictionary(g => g.Key, g => g.First());
+            SingerGroups = singers
+                .GroupBy(s => s.SingerType)
+                .ToDictionary(s => s.Key, s => s.LocalizedOrderBy(singer => singer.LocalizedName).ToList());
+            stopWatch.Stop();
+            Log.Information($"Search all singers: {stopWatch.Elapsed}");
         }
 
         public USinger GetSinger(string name) {
@@ -122,15 +109,15 @@ private void Refresh() {
         public void ReleaseSingersNotInUse(UProject project) {
             //Check which singers are in use
             var singersInUse = new HashSet<USinger>();
-            foreach(var track in project.tracks){
+            foreach (var track in project.tracks) {
                 var singer = track.Singer;
-                if(singer != null && singer.Found && !singersInUse.Contains(singer)) {
+                if (singer != null && singer.Found && !singersInUse.Contains(singer)) {
                     singersInUse.Add(singer);
                 }
             }
             //Release singers that are no longer in use
-            foreach(var singer in singersUsed){
-                if(!singersInUse.Contains(singer)){
+            foreach (var singer in singersUsed) {
+                if (!singersInUse.Contains(singer)) {
                     singer.FreeMemory();
                 }
             }

diff --git a/OpenUtau/App.axaml.cs b/OpenUtau/App.axaml.cs
@@ -23,15 +23,13 @@ public override void Initialize() {
             AvaloniaXamlLoader.Load(this);
             InitializeCulture();
             InitializeTheme();
-            InitOpenUtau();
-            InitAudio();
             Log.Information("Initialized application.");
         }
 
         public override void OnFrameworkInitializationCompleted() {
             Log.Information("Framework initialization completed.");
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
-                desktop.MainWindow = new MainWindow();
+                desktop.MainWindow = new SplashWindow();
             }
 
             base.OnFrameworkInitializationCompleted();
@@ -112,32 +110,5 @@ public static void SetTheme() {
             }
             ThemeManager.LoadTheme();
         }
-
-        public static void InitOpenUtau() {
-            Log.Information("Initializing OpenUtau.");
-            ToolsManager.Inst.Initialize();
-            SingerManager.Inst.Initialize();
-            DocManager.Inst.Initialize();
-            DocManager.Inst.PostOnUIThread = action => Avalonia.Threading.Dispatcher.UIThread.Post(action);
-            Log.Information("Initialized OpenUtau.");
-        }
-
-        public static void InitAudio() {
-            Log.Information("Initializing audio.");
-            if (!OS.IsWindows() || Core.Util.Preferences.Default.PreferPortAudio) {
-                try {
-                    PlaybackManager.Inst.AudioOutput = new Audio.MiniAudioOutput();
-                } catch (Exception e1) {
-                    Log.Error(e1, "Failed to init MiniAudio");
-                }
-            } else {
-                try {
-                    PlaybackManager.Inst.AudioOutput = new Audio.NAudioOutput();
-                } catch (Exception e2) {
-                    Log.Error(e2, "Failed to init NAudio");
-                }
-            }
-            Log.Information("Initialized audio.");
-        }
     }
 }
diff --git a/OpenUtau/ViewModels/MainWindowViewModel.cs b/OpenUtau/ViewModels/MainWindowViewModel.cs
@@ -90,10 +90,6 @@ public void Redo() {
             DocManager.Inst.Redo();
         }
 
-        public Task? GetInitSingerTask() {
-            return SingerManager.Inst.InitializationTask;
-        }
-
         public void InitProject() {
             var args = Environment.GetCommandLineArgs();
             if (args.Length == 2 && File.Exists(args[1])) {

diff --git a/OpenUtau/Views/MainWindow.axaml b/OpenUtau/Views/MainWindow.axaml
@@ -18,7 +18,7 @@
     </Style>
   </Window.Styles>
   <Grid>
-    <Grid Name="MainGrid" DragDrop.AllowDrop="True" IsEnabled="False" IsVisible="False" Margin="{Binding $parent[1].WindowDecorationMargin}">
+    <Grid Name="MainGrid" DragDrop.AllowDrop="True" Margin="{Binding $parent[1].WindowDecorationMargin}">
       <Grid RowDefinitions="24,24,1*,20,4" ColumnDefinitions="300,*,24" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <Menu Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left"
               Opened="OnMainMenuOpened" Closed="OnMainMenuClosed" PointerExited="OnMainMenuPointerLeave">
@@ -269,8 +269,5 @@
         <ProgressBar Grid.Row="4" Grid.ColumnSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Value="{Binding Progress}"/>
       </Grid>
     </Grid>
-    <Border Name="Splash">
-      <TextBlock Text="{DynamicResource progress.loadingsingers}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-    </Border>
   </Grid>
 </Window>