rename AudioPrint to AudioOutput

pschatzmann · pschatzmann · commit 9782364ed4bf · 2023-04-29T21:29:26.000+02:00
diff --git a/._.DS_Store b/._.DS_Store
diff --git a/docs/html/_text_to_speech_8h_source.html b/docs/html/_text_to_speech_8h_source.html
@@ -72,7 +72,7 @@
 <div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#pragma once</span></div>
 <div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#ifndef NO_SPEECH</span></div>
 <div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="preprocessor">#include &quot;AudioCodecs/CodecMP3Helix.h&quot;</span></div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioPrint.h&quot;</span></div>
+<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioOutput.h&quot;</span></div>
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioStreams.h&quot;</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioTypes.h&quot;</span></div>
 <div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;NumberToText.h&quot;</span></div>
@@ -93,7 +93,7 @@
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;    begin();</div>
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;  }</div>
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160; </div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <a class="code" href="classsimple__tts_1_1_text_to_speech.html#a7ab9d174704592d9fdc5e5b7c97d4cf3">TextToSpeech</a>(<a class="code" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioPrint &amp;sink, AudioDecoder &amp;decoder,</div>
+<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  <a class="code" href="classsimple__tts_1_1_text_to_speech.html#a7ab9d174704592d9fdc5e5b7c97d4cf3">TextToSpeech</a>(<a class="code" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioOutput &amp;sink, AudioDecoder &amp;decoder,</div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;               <a class="code" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict) {</div>
 <div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;    tts.registerCallback(<a class="code" href="classsimple__tts_1_1_text_to_speech.html#aef5be846d3540b0591952d4b50467bca">callback</a>, <span class="keyword">this</span>);</div>
 <div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;    p_tts = &amp;tts;</div>
diff --git a/docs/html/_text_to_speech_queue_8h_source.html b/docs/html/_text_to_speech_queue_8h_source.html
@@ -75,7 +75,7 @@
 <div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160; </div>
 <div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="preprocessor">#include &quot;AudioCodecs/CodecMP3Helix.h&quot;</span></div>
 <div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="preprocessor">#include &quot;AudioDictionary.h&quot;</span></div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioPrint.h&quot;</span></div>
+<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioOutput.h&quot;</span></div>
 <div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioStreams.h&quot;</span></div>
 <div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="preprocessor">#include &quot;AudioTools/AudioTypes.h&quot;</span></div>
 <div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="preprocessor">#include &quot;NumberToText.h&quot;</span></div>
@@ -95,7 +95,7 @@
 <div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;    <a class="code" href="classsimple__tts_1_1_text_to_speech_queue.html#aae0a8c5dc38c4dfff7c0ed9551a6cbc4">begin</a>();</div>
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;  }</div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160; </div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <a class="code" href="classsimple__tts_1_1_text_to_speech_queue.html#ab33ad51a66945e59edae75460dd023e6">TextToSpeechQueue</a>(<a class="code" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioPrint &amp;sink, AudioDecoder &amp;decoder,</div>
+<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;  <a class="code" href="classsimple__tts_1_1_text_to_speech_queue.html#ab33ad51a66945e59edae75460dd023e6">TextToSpeechQueue</a>(<a class="code" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioOutput &amp;sink, AudioDecoder &amp;decoder,</div>
 <div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;                    <a class="code" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict) {</div>
 <div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;    tts.registerCallback(<a class="code" href="classsimple__tts_1_1_text_to_speech_queue.html#aab744bc896bd996f4ffcb59d7424eb79">callback</a>, <span class="keyword">this</span>);</div>
 <div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;    p_tts = &amp;tts;</div>
diff --git a/docs/html/classsimple__tts_1_1_text_to_speech-members.html b/docs/html/classsimple__tts_1_1_text_to_speech-members.html
@@ -87,7 +87,7 @@
   <tr class="even"><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html#ac832e8ee5f5631cc8a75d0afd2ab824d">say</a>(const char *word)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html#a3e32159205a745f4d3a59b40ce57c57b">say</a>(audio_tools::Vector&lt; const char * &gt; words)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html#a7ab9d174704592d9fdc5e5b7c97d4cf3">TextToSpeech</a>(SimpleTTSBase &amp;tts, AudioStream &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>TextToSpeech</b>(SimpleTTSBase &amp;tts, AudioPrint &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict) (defined in <a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a>)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>TextToSpeech</b>(SimpleTTSBase &amp;tts, AudioOutput &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict) (defined in <a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a>)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html#a316f6162063dc215f5e37b6326b109e1">TextToSpeech</a>(AudioStream &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>~TextToSpeech</b>() (defined in <a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a>)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech.html">simple_tts::TextToSpeech</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
 </table></div><!-- contents -->
diff --git a/docs/html/classsimple__tts_1_1_text_to_speech.html b/docs/html/classsimple__tts_1_1_text_to_speech.html
@@ -87,7 +87,7 @@
 <tr class="memdesc:a7ab9d174704592d9fdc5e5b7c97d4cf3"><td class="mdescLeft">&#160;</td><td class="mdescRight"><a class="el" href="classsimple__tts_1_1_text_to_speech.html" title="Audio output from text via the indicated audio sink. The text components need to be prerecorded and a...">TextToSpeech</a> which support a <a class="el" href="classsimple__tts_1_1_simple_t_t_s_base.html" title="Common Functionality for TTS classes.">SimpleTTSBase</a>. <br /></td></tr>
 <tr class="separator:a7ab9d174704592d9fdc5e5b7c97d4cf3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a60b6e2198f3796d633892b9d4f2ede68"><td class="memItemLeft" align="right" valign="top"><a id="a60b6e2198f3796d633892b9d4f2ede68"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>TextToSpeech</b> (<a class="el" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioPrint &amp;sink, AudioDecoder &amp;decoder, <a class="el" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict)</td></tr>
+&#160;</td><td class="memItemRight" valign="bottom"><b>TextToSpeech</b> (<a class="el" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioOutput &amp;sink, AudioDecoder &amp;decoder, <a class="el" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict)</td></tr>
 <tr class="separator:a60b6e2198f3796d633892b9d4f2ede68"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a316f6162063dc215f5e37b6326b109e1"><td class="memItemLeft" align="right" valign="top"><a id="a316f6162063dc215f5e37b6326b109e1"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classsimple__tts_1_1_text_to_speech.html#a316f6162063dc215f5e37b6326b109e1">TextToSpeech</a> (AudioStream &amp;sink, AudioDecoder &amp;decoder, <a class="el" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict)</td></tr>
diff --git a/docs/html/classsimple__tts_1_1_text_to_speech_queue-members.html b/docs/html/classsimple__tts_1_1_text_to_speech_queue-members.html
@@ -98,7 +98,7 @@
   <tr><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html#a0ee45611587039062104c1ed7f6cac35">silence</a>(int n=1)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html#ad02e6edf96cf855bbd8721dd4f5f3f43">size</a>()</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html#ab33ad51a66945e59edae75460dd023e6">TextToSpeechQueue</a>(SimpleTTSBase &amp;tts, AudioStream &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>TextToSpeechQueue</b>(SimpleTTSBase &amp;tts, AudioPrint &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict) (defined in <a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a>)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>TextToSpeechQueue</b>(SimpleTTSBase &amp;tts, AudioOutput &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict) (defined in <a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a>)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html#aa05c1ef531306fe70b093671ef8b814a">TextToSpeechQueue</a>(AudioStream &amp;sink, AudioDecoder &amp;decoder, AudioDictionaryBase &amp;dict)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~TextToSpeechQueue</b>() (defined in <a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a>)</td><td class="entry"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html">simple_tts::TextToSpeechQueue</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
 </table></div><!-- contents -->
diff --git a/docs/html/classsimple__tts_1_1_text_to_speech_queue.html b/docs/html/classsimple__tts_1_1_text_to_speech_queue.html
@@ -87,7 +87,7 @@
 <tr class="memdesc:ab33ad51a66945e59edae75460dd023e6"><td class="mdescLeft">&#160;</td><td class="mdescRight"><a class="el" href="classsimple__tts_1_1_text_to_speech.html" title="Audio output from text via the indicated audio sink. The text components need to be prerecorded and a...">TextToSpeech</a> which support a <a class="el" href="classsimple__tts_1_1_simple_t_t_s_base.html" title="Common Functionality for TTS classes.">SimpleTTSBase</a>. <br /></td></tr>
 <tr class="separator:ab33ad51a66945e59edae75460dd023e6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa78bb1b499aa052569b1658fee6c88de"><td class="memItemLeft" align="right" valign="top"><a id="aa78bb1b499aa052569b1658fee6c88de"></a>
-&#160;</td><td class="memItemRight" valign="bottom"><b>TextToSpeechQueue</b> (<a class="el" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioPrint &amp;sink, AudioDecoder &amp;decoder, <a class="el" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict)</td></tr>
+&#160;</td><td class="memItemRight" valign="bottom"><b>TextToSpeechQueue</b> (<a class="el" href="classsimple__tts_1_1_simple_t_t_s_base.html">SimpleTTSBase</a> &amp;tts, AudioOutput &amp;sink, AudioDecoder &amp;decoder, <a class="el" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict)</td></tr>
 <tr class="separator:aa78bb1b499aa052569b1658fee6c88de"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa05c1ef531306fe70b093671ef8b814a"><td class="memItemLeft" align="right" valign="top"><a id="aa05c1ef531306fe70b093671ef8b814a"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classsimple__tts_1_1_text_to_speech_queue.html#aa05c1ef531306fe70b093671ef8b814a">TextToSpeechQueue</a> (AudioStream &amp;sink, AudioDecoder &amp;decoder, <a class="el" href="classsimple__tts_1_1_audio_dictionary_base.html">AudioDictionaryBase</a> &amp;dict)</td></tr>
diff --git a/docs/latex/_text_to_speech_8h_source.tex b/docs/latex/_text_to_speech_8h_source.tex
@@ -5,7 +5,7 @@
 \DoxyCodeLine{1 \textcolor{preprocessor}{\#pragma once}}
 \DoxyCodeLine{2 \textcolor{preprocessor}{\#ifndef NO\_SPEECH}}
 \DoxyCodeLine{3 \textcolor{preprocessor}{\#include "{}AudioCodecs/CodecMP3Helix.h"{}}}
-\DoxyCodeLine{4 \textcolor{preprocessor}{\#include "{}AudioTools/AudioPrint.h"{}}}
+\DoxyCodeLine{4 \textcolor{preprocessor}{\#include "{}AudioTools/AudioOutput.h"{}}}
 \DoxyCodeLine{5 \textcolor{preprocessor}{\#include "{}AudioTools/AudioStreams.h"{}}}
 \DoxyCodeLine{6 \textcolor{preprocessor}{\#include "{}AudioTools/AudioTypes.h"{}}}
 \DoxyCodeLine{7 \textcolor{preprocessor}{\#include "{}NumberToText.h"{}}}
@@ -31,7 +31,7 @@
 \DoxyCodeLine{34     begin();}
 \DoxyCodeLine{35   \}}
 \DoxyCodeLine{36 }
-\DoxyCodeLine{37   \mbox{\hyperlink{classsimple__tts_1_1_text_to_speech_a7ab9d174704592d9fdc5e5b7c97d4cf3}{TextToSpeech}}(\mbox{\hyperlink{classsimple__tts_1_1_simple_t_t_s_base}{SimpleTTSBase}} \&tts, AudioPrint \&sink, AudioDecoder \&decoder,}
+\DoxyCodeLine{37   \mbox{\hyperlink{classsimple__tts_1_1_text_to_speech_a7ab9d174704592d9fdc5e5b7c97d4cf3}{TextToSpeech}}(\mbox{\hyperlink{classsimple__tts_1_1_simple_t_t_s_base}{SimpleTTSBase}} \&tts, AudioOutput \&sink, AudioDecoder \&decoder,}
 \DoxyCodeLine{38                \mbox{\hyperlink{classsimple__tts_1_1_audio_dictionary_base}{AudioDictionaryBase}} \&dict) \{}
 \DoxyCodeLine{39     tts.registerCallback(\mbox{\hyperlink{classsimple__tts_1_1_text_to_speech_aef5be846d3540b0591952d4b50467bca}{callback}}, \textcolor{keyword}{this});}
 \DoxyCodeLine{40     p\_tts = \&tts;}
diff --git a/examples/._.DS_Store b/examples/._.DS_Store
diff --git a/examples/time-to-speech/._CMakeLists.txt b/examples/time-to-speech/._CMakeLists.txt
diff --git a/src/TextToSpeech.h b/src/TextToSpeech.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef NO_SPEECH
 #include "AudioCodecs/CodecMP3Helix.h"
-#include "AudioTools/AudioPrint.h"
+#include "AudioTools/AudioOutput.h"
 #include "AudioTools/AudioStreams.h"
 #include "AudioTools/AudioTypes.h"
 #include "NumberToText.h"
@@ -29,7 +29,7 @@ class TextToSpeech {
     begin();
   }
 
-  TextToSpeech(SimpleTTSBase &tts, AudioPrint &sink, AudioDecoder &decoder,
+  TextToSpeech(SimpleTTSBase &tts, AudioOutput &sink, AudioDecoder &decoder,
                AudioDictionaryBase &dict) {
     tts.registerCallback(callback, this);
     p_tts = &tts;
diff --git a/src/TextToSpeechQueue.h b/src/TextToSpeechQueue.h
@@ -4,7 +4,7 @@
 
 #include "AudioCodecs/CodecMP3Helix.h"
 #include "AudioDictionary.h"
-#include "AudioTools/AudioPrint.h"
+#include "AudioTools/AudioOutput.h"
 #include "AudioTools/AudioStreams.h"
 #include "AudioTools/AudioTypes.h"
 #include "NumberToText.h"
@@ -31,7 +31,7 @@ class TextToSpeechQueue {
     begin();
   }
 
-  TextToSpeechQueue(SimpleTTSBase &tts, AudioPrint &sink, AudioDecoder &decoder,
+  TextToSpeechQueue(SimpleTTSBase &tts, AudioOutput &sink, AudioDecoder &decoder,
                     AudioDictionaryBase &dict) {
     tts.registerCallback(callback, this);
     p_tts = &tts;
