Vector was moved to Collections

Author: pschatzmann

examples/tts-udp-server/tts-udp-server.h

@@ -0,0 +1,71 @@
+/**
+ * @file tts-udp-server.h
+ * @author Phil Schatzmann
+ * @brief A simple UDP server which speaks out words
+ * @version 0.1
+ * @date 2022-03-17
+ *
+ * @copyright Copyright (c) 2022
+ *
+ */
+
+#include "SimpleTTS.h"
+#include "AudioCodecs/CodecMP3Helix.h"
+#include "AudioLibs/Communication.h"
+
+I2SStream out;
+VolumeStream volume(out);
+
+MP3DecoderHelix mp3;
+AudioDictionary dictionary(ExampleAudioDictionaryValues);
+NumberToText ntt;
+TextToSpeechQueue queue(ntt, volume, mp3, dictionary);
+UDPStream udp;
+char buffer[160];
+
+// Provides a fixed string from dictionary for a temporary input string
+const char *toName(char *str) {
+  for (auto e : ExampleAudioDictionaryValues) {
+    Str str1(str);
+    str1.trim();
+    if (str1.equalsIgnoreCase(e.name)) {
+      return e.name;
+    }
+  }
+  return nullptr;
+}
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  // setting the volume
+  volume.setVolume(0.6);
+
+  // setup out
+  auto cfg = out.defaultConfig();
+  cfg.sample_rate = 24000;
+  cfg.channels = 1;
+  out.begin(cfg);
+}
+
+void loop() {
+  // fill queue with words from UDP
+  while (udp.available()) {
+    if (udp.readBytesUntil(' ', (uint8_t*)buffer, 160) > 0) {
+      Str bufferStr((const char*)buffer);
+      bufferStr.trim();
+      if (bufferStr.isNumber()) {
+        double value = bufferStr.toDouble();
+        int decimals = bufferStr.numberOfDecimals();
+        for (auto str : ntt.say(value, decimals)) {
+          queue.say(toName((char*)str));
+        }
+      } else {
+        queue.say(toName(buffer));
+      }
+    }
+  }
+  // play next word in queue
+  queue.process();
+}

src/NumberToText.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "SimpleTTSBase.h"
-#include "AudioBasic/Vector.h"
+#include "AudioBasic/Collections/Vector.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/TextToSpeechQueue.h

@@ -56,12 +56,18 @@ class TextToSpeechQueue {
 
   /// a simple API to add a single c string to the queue
   void say(const char *word) {
-    LOGI("%s", word);
-    queue.push_back(word);
+    if (word != nullptr) {
+      LOGI("%s", word);
+      queue.push_back(word);
+    }
   }
 
   /// Adds a word to the front
-  void sayNow(const char *word) { queue.push_front(word); }
+  void sayNow(const char *word) {
+    if (word != nullptr) {
+      queue.push_front(word);
+    }
+  }
 
   /// Addds an array of c strings
   void say(const char *word[], int size) {
@@ -121,8 +127,8 @@ class TextToSpeechQueue {
   }
 
   /// Sends silence to mp3 decoder for n secods
-  void silence(int n=1){
-    for (int j=0;j<n;j++){
+  void silence(int n = 1) {
+    for (int j = 0; j < n; j++) {
       processWord("SILENCE");
     }
   }
@@ -182,7 +188,6 @@ class TextToSpeechQueue {
   audio_tools::StreamCopy copier;  // copy in to out
   Print *p_sink = nullptr;
 
-
   /// callback which adds the words to the queue
   static void callback(audio_tools::Vector<const char *> words, void *ref) {
     TextToSpeechQueue *self = (TextToSpeechQueue *)ref;