Run OSC message sending

ButterscotchV · Jan 30, 2024 · 96dc761 · 96dc761
1 parent 91844fe
commit 96dc761
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/ButterSTT/MessageSystem/OSCMessageHandler.cs b/ButterSTT/MessageSystem/OSCMessageHandler.cs
@@ -13,6 +13,8 @@ public class OSCMessageHandler
         private CancellationTokenSource? _messageLoopCancelSource;
         private Task? _messageLoop;
 
+        private string _lastMessage = "";
+
         public bool IsLoopRunning => _messageLoop != null && !_messageLoop.IsCompleted;
 
         public void StartMessageLoop()
@@ -60,7 +62,7 @@ private void SendMessage()
             try
             {
                 var message = MessageQueue.GetCurrentMessage();
-                if (string.IsNullOrWhiteSpace(message))
+                if (string.IsNullOrWhiteSpace(message) || message == _lastMessage)
                     return;
 
                 var chatbox = OSCHandler.MakeChatboxInput(message);
@@ -76,6 +78,8 @@ private void SendMessage()
                         new OscBundle(0, chatbox, OSCHandler.MakeChatboxTyping(true))
                     );
                 }
+
+                _lastMessage = message;
             }
             catch (Exception ex)
             {

diff --git a/ButterSTT/Program.cs b/ButterSTT/Program.cs
@@ -1,4 +1,5 @@
 using ButterSTT;
+using ButterSTT.MessageSystem;
 
 // Setup model dir
 var modelsDir = Path.GetFullPath("Models");
@@ -13,7 +14,10 @@
         $"Could not find any available AprilAsr models (*.april) in \"{modelsDir}\"."
     );
 
-using var speechToTextHandler = new SpeechToTextHandler(modelPath);
+var oscHandler = new OSCMessageHandler();
+oscHandler.StartMessageLoop();
+
+using var speechToTextHandler = new SpeechToTextHandler(modelPath, oscHandler.MessageQueue);
 speechToTextHandler.StartRecording();
 
 Console.ReadLine();
diff --git a/ButterSTT/SpeechToTextHandler.cs b/ButterSTT/SpeechToTextHandler.cs
@@ -22,13 +22,19 @@ public class SpeechToTextHandler : IDisposable
         // Output
         private readonly StringBuilder _consoleOutput = new();
         private readonly StringBuilder _aprilOutput = new();
-        private readonly OSCMessageHandler _oscHandler = new();
+        private readonly MessageQueue _messageQueue;
 
         public int WaveDeviceNumber { get; private set; } = 0;
         public bool MicrophoneRecording { get; private set; } = false;
 
-        public SpeechToTextHandler(string modelPath, int deviceNumber = 0)
+        public SpeechToTextHandler(
+            string modelPath,
+            MessageQueue messageQueue,
+            int deviceNumber = 0
+        )
         {
+            _messageQueue = messageQueue;
+
             // Load model
             _model = new AprilModel(modelPath);
             ModelPath = modelPath;
@@ -145,17 +151,15 @@ private void OnAprilTokens(AprilResultKind result, AprilToken[] tokens)
 
             if (result == AprilResultKind.FinalRecognition)
             {
-                _oscHandler.MessageQueue.CurParagraph = EnglishTextParser.ParseParagraph(
+                _messageQueue.CurParagraph = EnglishTextParser.ParseParagraph(
                     aprilOutputString,
                     wordRegex: EnglishTextParser.WordKeepUrl()
                 );
-                _oscHandler.MessageQueue.FinishCurrentParagraph();
+                _messageQueue.FinishCurrentParagraph();
             }
             else
             {
-                _oscHandler.MessageQueue.CurParagraph = EnglishTextParser.ParseParagraph(
-                    aprilOutputString
-                );
+                _messageQueue.CurParagraph = EnglishTextParser.ParseParagraph(aprilOutputString);
             }
 
             _consoleOutput.Append(aprilOutputString);