Fixed logic error in phonemizing

EX3exp · Sep 27, 2024 · b94c44a · b94c44a
1 parent 3472c25
commit b94c44a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 53 deletions.
diff --git a/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs b/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs
@@ -69,6 +69,11 @@ public string CurrentScript
 
                 if ( value != null)
                 {
+                    if (value == _currentScript)
+                    {
+                        Log.Debug("CurrentScript was same as lastScript");
+                        return;
+                    }
                     lastScript = _currentScript;
 
                     //Log.Debug("CurrentScript: {value}", value);
@@ -98,7 +103,6 @@ public string CurrentScript
                     this.RaiseAndSetIfChanged(ref _currentScript, value);
 
                     OnPropertyChanged(nameof(CurrentScript));
-
                 }
 
 

diff --git a/Mirivoice/Mirivoice.Core/Format/MResult.cs b/Mirivoice/Mirivoice.Core/Format/MResult.cs
@@ -50,5 +50,6 @@ public MResult(MResultPrototype mResultPrototype): base(mResultPrototype.Phoneme
         }
         public override void OnVoicerChanged(Voicer value) { }
         public override void OnVoicerCultureChanged(CultureInfo culture) { }
+
     }
 }
diff --git a/Mirivoice/Mirivoice.Core/Managers/AudioManager.cs b/Mirivoice/Mirivoice.Core/Managers/AudioManager.cs
@@ -21,6 +21,7 @@ public class AudioManager
         private LineBoxView _;
         private readonly MainViewModel v;
         private bool MainViewModelPlaying;
+        public bool IsPlaying => _waveOut.PlaybackState == PlaybackState.Playing;
         public AudioManager(MainViewModel v)
         {
             this.v = v;

diff --git a/Mirivoice/ViewModels/MainViewModel.cs b/Mirivoice/ViewModels/MainViewModel.cs
@@ -353,6 +353,7 @@ public void ClearCache()
         public void PlayAudio(string path)
         {
             MainManager.Instance.AudioM.PlayAudio(path);
+
         }
 
         public void StopAudio()
@@ -847,5 +848,6 @@ public async void OnVoicerInstallButtonClick()
         public override void OnVoicerChanged(Voicer value) { }
 
         public override void OnVoicerCultureChanged(CultureInfo culture) { }
+
     }
 }
diff --git a/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs b/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs
@@ -67,6 +67,7 @@ public VoicerSelectingViewModelBase(int voicerIndex, bool useVoicerSelector = fa
         }
         public abstract void OnVoicerChanged(Voicer value);
         public abstract void OnVoicerCultureChanged(CultureInfo culture);
+
         public VoicerSelectingViewModelBase(string initText, bool saveUndoAtInit, bool useVoicerSelector = false)
         {
             if (useVoicerSelector)

diff --git a/Mirivoice/Views/LineBoxView.axaml.cs b/Mirivoice/Views/LineBoxView.axaml.cs
@@ -108,6 +108,7 @@ public bool ShouldPhonemize
             }
         }
 
+        public string lastPhonemizedText = string.Empty;
         private async Task PhonemizeLine(bool ApplyToCurrentEdit = true)
         {
             if (viewModel is null)
@@ -140,6 +141,7 @@ private async Task PhonemizeLine(bool ApplyToCurrentEdit = true)
                 else
                 {
                     await Task.Run(() => viewModel.phonemizer.PhonemizeAsync(textChanged, this, ApplyToCurrentEdit));
+                    lastPhonemizedText = textChanged;
                 }
 
 

diff --git a/Mirivoice/Views/SingleLineEditorView.axaml.cs b/Mirivoice/Views/SingleLineEditorView.axaml.cs
@@ -28,56 +28,20 @@ public SingleLineEditorView(LineBoxView l, bool FirstUpdate = true)
 
     private async void LineTextChanged(object sender, TextChangedEventArgs e)
     {
-
-        var textBox = sender as TextBox;
-        if (textBox != null)
+        
+        l.DeActivatePhonemizer = false;
+        if (FirstUpdate)
         {
-            try
-            {
-
-                string textChanged = textBox.Text;
-                if (l is null)
-                {
-                    //Log.Debug("LineBoxView is null");
-                    return;
-                }
-                if (l.viewModel.LineText == textBox.Text)
-                {
-                    //Log.Debug($"No need to phonemize ---- SingleLineTBox '{textBox.Text}' // linePreview '{l.viewModel.LineText}' "); ;
-                    l.DeActivatePhonemizer = true; // no need to phonemize
-                }
-                else
-                {
-                    //Log.Debug($"SingleLineTBox '{textBox.Text}' // linePreview '{l.viewModel.LineText}' "); ;
-                    l.viewModel.LineText = textChanged;
-                    l.DeActivatePhonemizer = false;
-                    if (FirstUpdate)
-                    {
-                        FirstUpdate = false;
-                        Task.Run(() => l.viewModel.phonemizer.PhonemizeAsync(viewModel.mTextBoxEditor.CurrentScript, l));
-                        return;
-                    }
-                    if (l.ShouldPhonemize && !l.DeActivatePhonemizer)
-                    {
-                        await Task.Run(() => l.viewModel.phonemizer.PhonemizeAsync(textChanged, l));
-                    }
-
-
-
-                }
-
-
-
-
-
-
-            }
-            finally
-            {
-
-            }
-
+            FirstUpdate = false;
+            Task.Run(() => l.viewModel.phonemizer.PhonemizeAsync(viewModel.mTextBoxEditor.CurrentScript, l));
+            return;
         }
+        if (l.ShouldPhonemize && !l.DeActivatePhonemizer)
+        {
+            await Task.Run(() => l.viewModel.phonemizer.PhonemizeAsync(viewModel.mTextBoxEditor.CurrentScript, l));
+        }
+        l.viewModel.LineText = viewModel.mTextBoxEditor.CurrentScript;
+
     }
 
     private void LineLostFocus(object sender, RoutedEventArgs e)

diff --git a/Mirivoice/Views/VoicersStyleBox.axaml.cs b/Mirivoice/Views/VoicersStyleBox.axaml.cs
@@ -11,6 +11,7 @@
 using Serilog;
 using System.IO;
 using System.Linq;
+using Mirivoice.Mirivoice.Core;
 namespace Mirivoice;
 
 
@@ -47,21 +48,18 @@ private void InitializeComponent()
 
     public async void OnSamplePlayButtonClick(object sender, RoutedEventArgs e)
     {
-        if (isPlaying)
+        if (MainManager.Instance.AudioM.IsPlaying)
         {
             v.StopAudio();
-            isPlaying = false;
             return;
         }
         if (File.Exists(cachePath))
         {
             isPlaying = true;
-            v.PlayAudio(cachePath);
             return;
         }
         if (voicer != null)
         {
-            isPlaying = true;
             string ipa = await phonemizer.ConvertToIPA(phrase, DispatcherPriority.ApplicationIdle);
             voicer.Inference(ipa, cachePath, null, sid);
             v.PlayAudio(cachePath);
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             public override void OnVoicerChanged(Voicer value) { }
             public override void OnVoicerCultureChanged(CultureInfo culture) { }
         }
     }