Fixed minor bugs

EX3exp · Oct 14, 2024 · e704d09 · e704d09
1 parent 932bf39
commit e704d09
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/Mirivoice/Mirivoice.Core/Managers/AudioManager.cs b/Mirivoice/Mirivoice.Core/Managers/AudioManager.cs
@@ -386,10 +386,12 @@ private void OnPlaybackStopped(object? sender, EventArgs e)
         {
             Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() =>
             {
+
                 Log.Information("Playback stopped.");
+                v.isPlaying = false;
                 if (audioPaths.Count == 0) // when stopped
                 {
-                    v.isPlaying = false;
+
                     if (!_player.Paused)
                     {
                         v.EnableGlobalPlay = true;
@@ -457,6 +459,7 @@ public void StopAudio()
                 audioPaths.Clear();
                 v.MainWindowGetInput = true;
                 MainViewModelPlaying = false;
+                v.isPlaying = false;
             }
 
         }

diff --git a/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs b/Mirivoice/Mirivoice.Plugins.Builtin/Phonemizers/BasePhonemizer.cs
@@ -254,7 +254,7 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
                             {
                                 prosodyType = ProsodyType.Space;
                             }
-                            results[index] = new MResultPrototype(word.Trim(), phoneme.Trim(), editable, prosodyType);
+                            results[index] = new MResultPrototype(words[index].Trim(), phoneme.Trim(), editable, prosodyType);
                         }
                         else
                         {
@@ -267,11 +267,11 @@ await Dispatcher.UIThread.InvokeAsync(async () =>
                             {
                                 Log.Error($"[Variated Sentence({words.Length})] - [Sentence length({variatedWords.Length})] mismatch");
 
-                                results[index] = new MResultPrototype(word.Trim(), phoneme.Trim(), editable, ProsodyType.Undefined);
+                                results[index] = new MResultPrototype(variatedWords[index].Trim(), phoneme.Trim(), editable, ProsodyType.Undefined);
                             }
                             else
                             {
-                                results[index] = new MResultPrototype(word.Trim(), phoneme.Trim(), editable, ProsodyType.Undefined);
+                                results[index] = new MResultPrototype(words[index].Trim(), phoneme.Trim(), editable, ProsodyType.Undefined);
                             }
                         }
 
@@ -329,8 +329,8 @@ public static MResultPrototype[] SetUpProsody(LineBoxView l, List<MResultPrototy
 
                     if (next is not null && IsPunctuation(next.Phoneme) && endPuncs.Contains(next.Phoneme))
                     {
-                        Log.Debug($"Next is punctuation: {next.Phoneme}");
-                        Log.Debug($"Current: {mResultPrototype.Phoneme}");
+                        //Log.Debug($"Next is punctuation: {next.Phoneme}");
+                        //Log.Debug($"Current: {mResultPrototype.Phoneme}");
                         mResultPrototype.ProsodyType = (int)ProsodyType.Eos;
                     }
                     if (i == results.Count - 1 && prev is not null && prev.ProsodyType != (int)ProsodyType.Eos)

diff --git a/Mirivoice/Views/LineBoxView.axaml.cs b/Mirivoice/Views/LineBoxView.axaml.cs
@@ -127,6 +127,10 @@ private async Task PhonemizeLine(bool ApplyToCurrentEdit = true)
                     v.OnPropertyChanged(nameof(v.SingleTextBoxEditorEnabled));
 
                 }
+                if (!lastPhonemizedText.Equals(textChanged))
+                {
+                    IsCacheIsVaild = false;
+                }
                 if (viewModel.phonemizer is null)
                 {
                     Log.Error("Skip Phonemizing: phonemizer is null");
@@ -135,14 +139,15 @@ private async Task PhonemizeLine(bool ApplyToCurrentEdit = true)
                 {
                     Log.Warning("Skip Phonemizing: phonemizer is not null, but LineText is empty");
                 }
-                else if (IsCacheIsVaild)
-                {
-                    Log.Information("Skip Phonemizing: Cache is valid");
-                }
+
                 else if (lastPhonemizedText.Equals(textChanged))
                 {
                     Log.Information("Skip Phonemizing: text is not changed");
                 }
+                else if (IsCacheIsVaild)
+                {
+                    Log.Information("Skip Phonemizing: Cache is valid");
+                }
                 else
                 {
                     Log.Debug("Phonemizing: {0}", textChanged);