Rename to Str and StrView

Author: pschatzmann

src/AudioDictionarySD.h

@@ -96,15 +96,15 @@ class AudioDictionarySD : public AudioDictionaryBase {
   }
 
  protected:
-  audio_tools::StrExt url_with_text;
+  audio_tools::Str url_with_text;
   AudioFile file;
   AudioStreamFileWrapper<AudioFile> fileWrapper;
 #ifndef USE_SD
   AudioFat SD;
 #endif
   const char *path;
   const char *ext;
-  StrExt file_path{40};  // allocate 40 bytes as a typical good initial size
+  Str file_path{40};  // allocate 40 bytes as a typical good initial size
   bool is_setup = false;
   int cs_pin = -1;
 

src/AudioDictionaryURL.h

@@ -36,7 +36,7 @@ class AudioDictionaryURL : public AudioDictionaryBase {
 protected:
   const char *url_cstr;
   const char *ext_cstr;
-  StrExt url_str;
+  Str url_str;
   URLStream *p_url;
 };
 

src/NumberToText.h

@@ -43,7 +43,7 @@ class NumberToText : public SimpleTTSBase {
     convert(wholeNumber);
 
     // add decimals
-    if (Str(decimals).toLong()>0l){
+    if (StrView(decimals).toLong()>0l){
       convertDecimals(decimals);
     }
 
@@ -106,7 +106,7 @@ class NumberToText : public SimpleTTSBase {
     }
   }
   void convert(const char* strValue){
-    convert(Str(strValue).toLong());
+    convert(StrView(strValue).toLong());
   }
 
   // TODO: convert to string operations

src/NumberUnitToText.h

@@ -45,7 +45,7 @@ class NumberUnitToText : public SimpleTTSBase {
     // determine unit
     const char* unit = unitIn ? unitIn : default_unit;
     // singular or plural ?
-    bool isOne = Str(wholeNumber).toLong() == 1l;
+    bool isOne = StrView(wholeNumber).toLong() == 1l;
 
     // We support 2 scenarios: combined units or just a smple number with a single unit.
     int idx = idxCombinedUnit(unit);
@@ -67,7 +67,7 @@ class NumberUnitToText : public SimpleTTSBase {
       const char* decimals_to_say = calc.decAsInt(decimals, digits);
       addAll(ntt.say(decimals_to_say));
       // say decimals unit
-      bool decIsOne = Str(decimals).toLong() == 1l;
+      bool decIsOne = StrView(decimals).toLong() == 1l;
       processDecimalUnit(idx, decIsOne);
     }
 

src/SimpleTTSBase.h

@@ -27,7 +27,7 @@ class SimpleTTSBase {
   void printCSV(Print &out) {
     for (auto txt : allTexts()) {
       if (txt!=nullptr && strlen(txt)>0){
-        StrExt str = txt; 
+        StrView str = txt; 
         str.toLowerCase(); // convert txt to lowercase
         out.print(str.c_str());
         out.print(",");

src/sandbox/Importer.h

@@ -68,7 +68,7 @@ class Importer {
   }
 
  protected:
-  audio_tools::StrExt url_with_text;
+  audio_tools::Str url_with_text;
   File file;
   AudioStreamFileWrapper fileWrapper;
   const char *path;

tools/audio.csv

@@ -30,6 +30,7 @@ eighty,eighty
 ninety,ninety
 and,and
 dot,dot
+point,point
 minus,minus
 hundred,hundred
 thousand,thousand