Remove AudioStreamX

pschatzmann · pschatzmann · commit 9ac71be93e5a · 2023-02-12T15:12:54.000+01:00
diff --git a/src/AudioAnalog/AnalogAudio.h b/src/AudioAnalog/AnalogAudio.h
@@ -15,7 +15,7 @@ namespace audio_tools {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class AnalogAudioStream  : public AudioStreamX {
+class AnalogAudioStream  : public AudioStream {
   public:
     /// Default constructor
     AnalogAudioStream()=default;
diff --git a/src/AudioCodecs/AudioEncoded.h b/src/AudioCodecs/AudioEncoded.h
@@ -149,7 +149,7 @@ class StreamingDecoder {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class EncodedAudioPrint : public AudioStreamX {
+class EncodedAudioPrint : public AudioStream {
 public:
   /// Constructor for AudioStream with automatic notification of audio changes
   EncodedAudioPrint(AudioStream *outputStream, AudioDecoder *decoder) {
diff --git a/src/AudioEffects/AudioEffects.h b/src/AudioEffects/AudioEffects.h
@@ -203,7 +203,7 @@ class AudioEffects : public SoundGenerator<effect_t> {
  * @copyright GPLv3*/
 
 template <class T>
-class AudioEffectStreamT : public AudioStreamX {
+class AudioEffectStreamT : public AudioStream {
   public:
     AudioEffectStreamT() = default;
 
@@ -388,7 +388,7 @@ class AudioEffectStreamT : public AudioStreamX {
  * @copyright GPLv3
  **/
 
-class AudioEffectStream : public AudioStreamX {
+class AudioEffectStream : public AudioStream {
     AudioEffectStream() = default;
 
     AudioEffectStream(Stream &io){
diff --git a/src/AudioFilter/Equilizer.h b/src/AudioFilter/Equilizer.h
@@ -37,7 +37,7 @@ struct ConfigEquilizer3Bands : public AudioBaseInfo {
  * @ingroup equilizer
  * @author pschatzmann
  */
-class Equilizer3Bands : public AudioStreamX {
+class Equilizer3Bands : public AudioStream {
     public:
 
         Equilizer3Bands(Print &out) {
diff --git a/src/AudioLibs/AudioESP8266.h b/src/AudioLibs/AudioESP8266.h
@@ -67,7 +67,7 @@ class AudioOutputWithCallback : public AudioOutput, public BufferedStream {
  * @brief Stream Adapter for ESP8288-Audio AudioOutput
  *
  */
-class ESP3288AudioOutput : public AudioStreamX {
+class ESP3288AudioOutput : public AudioStream {
  public:
   ESP3288AudioOutput(AudioOutput &out, int channels) {
     p_out = &out;
diff --git a/src/AudioLibs/AudioFaust.h b/src/AudioLibs/AudioFaust.h
@@ -12,7 +12,7 @@ namespace audio_tools {
  * @copyright GPLv3
  */
 template<class DSP>
-class FaustStream : public AudioStreamX {
+class FaustStream : public AudioStream {
   public:
 
     /// Constructor for Faust as Audio Source
diff --git a/src/AudioLibs/AudioKit.h b/src/AudioLibs/AudioKit.h
@@ -153,7 +153,7 @@ friend class AudioKitStream;
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class AudioKitStreamAdapter : public AudioStreamX {
+class AudioKitStreamAdapter : public AudioStream {
  public:
   AudioKitStreamAdapter(AudioKit *kit) { this->kit = kit; }
   size_t write(const uint8_t *data, size_t len) override {
@@ -176,7 +176,7 @@ class AudioKitStreamAdapter : public AudioStreamX {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class AudioKitStream : public AudioStreamX {
+class AudioKitStream : public AudioStream {
  public:
   AudioKitStream() { pt_AudioKitStream = this; }
 
diff --git a/src/AudioLibs/AudioMP34DT05.h b/src/AudioLibs/AudioMP34DT05.h
@@ -36,7 +36,7 @@ class AudioMP34DT05 *selfAudioMP34DT05 = nullptr;
  * implementation. See https://github.com/arduino/ArduinoCore-nRF528x-mbedos
  * @ingroup io
  */
-class AudioMP34DT05 : public AudioStreamX {
+class AudioMP34DT05 : public AudioStream {
  public:
   AudioMP34DT05() { selfAudioMP34DT05 = this; };
   virtual ~AudioMP34DT05() {
diff --git a/src/AudioLibs/Communication.h b/src/AudioLibs/Communication.h
@@ -72,7 +72,7 @@ struct ESPNowStreamConfig {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class ESPNowStream : public AudioStreamX {
+class ESPNowStream : public AudioStream {
  public:
   ESPNowStream() { ESPNowStreamSelf = this; };
 
@@ -623,7 +623,7 @@ class AudioSyncWriter : public AudioPrint {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class AudioSyncReader : public AudioStreamX {
+class AudioSyncReader : public AudioStream {
  public:
   AudioSyncReader(Stream &in, EncodedAudioStream &out,
                   bool isConfirmer = true) {
diff --git a/src/AudioLibs/Jupyter/JupyterAudio.h b/src/AudioLibs/Jupyter/JupyterAudio.h
@@ -108,7 +108,7 @@ using Chart = ChartT<int16_t>;
  * load the data again for different representations.
  */
 template <typename T> 
-class JupyterAudioT : public AudioStreamX {
+class JupyterAudioT : public AudioStream {
 public:
 
   JupyterAudioT(const char* fileName, AudioStream &stream, int bufferCount=20, int bufferSize=1024) {
diff --git a/src/AudioLibs/PortAudioStream.h b/src/AudioLibs/PortAudioStream.h
@@ -34,7 +34,7 @@ class PortAudioConfig : public AudioBaseInfo {
  * @brief Arduino Audio Stream using PortAudio
  * @ingroup io
  */
-class PortAudioStream : public AudioStreamX {
+class PortAudioStream : public AudioStream {
     public:
         PortAudioStream() {
             TRACED();
diff --git a/src/AudioLibs/StdioStream.h b/src/AudioLibs/StdioStream.h
@@ -9,7 +9,7 @@
  * @copyright GPLv3
  */
 namespace audio_tools {
-class StdioStream : public AudioStreamX {
+class StdioStream : public AudioStream {
 public:
   AudioBaseInfo defaultConfig() {
     AudioBaseInfo def;
diff --git a/src/AudioLibs/TfLiteAudioStream.h b/src/AudioLibs/TfLiteAudioStream.h
@@ -400,7 +400,7 @@ class TfLiteMicroSpeechRecognizeCommands : public TfLiteAbstractRecognizeCommand
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class TfLiteAudioStreamBase : public AudioStreamX {
+class TfLiteAudioStreamBase : public AudioStream {
   public:
     virtual void setInterpreter(tflite::MicroInterpreter* p_interpreter) = 0;
     virtual TfLiteConfig defaultConfig() = 0;
diff --git a/src/AudioLibs/VS1053Stream.h b/src/AudioLibs/VS1053Stream.h
@@ -49,12 +49,12 @@ class VS1053Config : public AudioBaseInfo {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class VS1053Stream : public AudioStreamX {
+class VS1053Stream : public AudioStream {
 
     /**
      * @brief Private output class for the EncodedAudioStream
      */
-    class VS1053StreamOut : public AudioStreamX {
+    class VS1053StreamOut : public AudioStream {
       public:
         VS1053StreamOut(VS1053 *vs){
             p_VS1053 = vs;
diff --git a/src/AudioLibs/WM8960Stream.h b/src/AudioLibs/WM8960Stream.h
@@ -36,7 +36,7 @@ class WM8960Config : public I2SConfig {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class WM8960Stream : public AudioStreamX {
+class WM8960Stream : public AudioStream {
 
 public:
 
diff --git a/src/AudioTools/AudioSPDIF.h b/src/AudioTools/AudioSPDIF.h
@@ -117,7 +117,7 @@ struct SPDIFConfig : public AudioBaseInfo {
  * @copyright GPLv3
  *
  */
-class SPDIFStream : public AudioStreamX {
+class SPDIFStream : public AudioStream {
  public:
   /// default constructor
   SPDIFStream() = default;
diff --git a/src/AudioTools/AudioStreams.h b/src/AudioTools/AudioStreams.h
@@ -55,9 +55,9 @@ class AudioStream : public Stream, public AudioBaseInfoDependent, public AudioBa
       p_notify = &bi;
   }
 
-  virtual size_t readBytes(uint8_t *buffer, size_t length) STREAM_WRITE_OVERRIDE = 0;
+  virtual size_t readBytes(uint8_t *buffer, size_t length) override { return not_supported(0); }
 
-  virtual size_t write(const uint8_t *buffer, size_t size) override = 0;
+  virtual size_t write(const uint8_t *buffer, size_t size) override{ return not_supported(0); }
 
   virtual size_t write(uint8_t ch) override {
       if (tmp.isFull()){
@@ -66,6 +66,8 @@ class AudioStream : public Stream, public AudioBaseInfoDependent, public AudioBa
       return tmp.write(ch);
   }
 
+  virtual int available() override { return DEFAULT_BUFFER_SIZE; };
+
 
   operator bool() { return available() > 0; }
 
@@ -97,6 +99,11 @@ class AudioStream : public Stream, public AudioBaseInfoDependent, public AudioBa
     return readBytes((uint8_t *)buffer, length);
   }
 
+  virtual int read() override { return not_supported(-1); }
+
+  virtual int peek() override { return not_supported(-1); }
+
+
 #endif
 
  protected:
@@ -106,34 +113,12 @@ class AudioStream : public Stream, public AudioBaseInfoDependent, public AudioBa
 
 
   virtual int not_supported(int out) {
-    LOGE("AudioStreamX: unsupported operation!");
+    LOGE("AudioStream: unsupported operation!");
     return out;
   }
 
 };
 
-/**
- * @brief Same as AudioStream - but we do not have any abstract methods
- *
- */
-class AudioStreamX : public AudioStream {
- public:
-  AudioStreamX() = default;
-  virtual ~AudioStreamX() = default;
-  AudioStreamX(AudioStreamX const&) = delete;
-  AudioStreamX& operator=(AudioStreamX const&) = delete;
-
-  virtual size_t readBytes(uint8_t *buffer, size_t length) override { return not_supported(0); }
-
-  virtual size_t write(const uint8_t *buffer, size_t size) override{ return not_supported(0); }
-
-  virtual int available() override { return not_supported(0); };
-
-  virtual int read() override { return not_supported(-1); }
-
-  virtual int peek() override { return not_supported(-1); }
-};
-
 /**
  * @brief To be used to support implementations where the readBytes is not
  * virtual
@@ -355,7 +340,7 @@ class MemoryStream : public AudioStream {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class DynamicMemoryStream : public AudioStreamX {
+class DynamicMemoryStream : public AudioStream {
 public:
   struct DataNode {
     size_t len=0;
@@ -556,7 +541,7 @@ class DynamicMemoryStream : public AudioStreamX {
  */
 
 template <class T>
-class GeneratedSoundStream : public AudioStreamX {
+class GeneratedSoundStream : public AudioStream {
  public:
   GeneratedSoundStream() = default;
   
@@ -837,11 +822,11 @@ class RingBufferStream : public AudioStream {
  * @copyright GPLv3
  */
 template <class T>
-class QueueStream : public AudioStreamX {
+class QueueStream : public AudioStream {
  public:
   /// Default constructor
   QueueStream(int bufferSize, int bufferCount, bool autoRemoveOldestDataIfFull=false)
-      : AudioStreamX() {
+      : AudioStream() {
     callback_buffer_ptr = new NBuffer<T>(bufferSize, bufferCount);
     remove_oldest_data = autoRemoveOldestDataIfFull;
   }
@@ -926,10 +911,10 @@ using CallbackBufferedStream = QueueStream<T>;
  * @param converter 
  */
 template<typename T, class ConverterT>
-class ConverterStream : public AudioStreamX {
+class ConverterStream : public AudioStream {
 
     public:
-        ConverterStream(Stream &stream, ConverterT &converter) : AudioStreamX() {
+        ConverterStream(Stream &stream, ConverterT &converter) : AudioStream() {
             p_converter = &converter;
             p_stream = &stream;
         }
@@ -968,7 +953,7 @@ class ConverterStream : public AudioStreamX {
  * @copyright GPLv3
  * @ingroup io
  */
-class MeasuringStream : public AudioStreamX {
+class MeasuringStream : public AudioStream {
   public:
     MeasuringStream(int count=10, Print *logOut=nullptr){
       this->count = count;
@@ -1084,7 +1069,7 @@ class MeasuringStream : public AudioStreamX {
  */
 
 template<typename T>
-class InputMixer : public AudioStreamX {
+class InputMixer : public AudioStream {
   public:
     InputMixer() = default;
 
@@ -1183,7 +1168,7 @@ class InputMixer : public AudioStreamX {
  * @tparam T 
  */
 template<typename T>
-class InputMerge : public AudioStreamX {
+class InputMerge : public AudioStream {
   public:
     /// Default constructor
     InputMerge() = default;
@@ -1275,9 +1260,9 @@ class InputMerge : public AudioStreamX {
  * @copyright GPLv3
  */
 template<typename T, class TF>
-class FilteredStream : public AudioStreamX {
+class FilteredStream : public AudioStream {
   public:
-        FilteredStream(Stream &stream, int channels=2) : AudioStreamX() {
+        FilteredStream(Stream &stream, int channels=2) : AudioStream() {
           this->channels = channels;
           p_stream = &stream;
           p_converter = new ConverterNChannels<T,TF>(channels);
diff --git a/src/AudioTools/AudioStreamsConverter.h b/src/AudioTools/AudioStreamsConverter.h
@@ -11,7 +11,7 @@ namespace audio_tools {
  * @copyright GPLv3
  */
 template<typename T>
-class ChannelFormatConverterStreamT : public AudioStreamX {
+class ChannelFormatConverterStreamT : public AudioStream {
   public:
         ChannelFormatConverterStreamT(Stream &stream){
           p_stream = &stream;
@@ -59,7 +59,7 @@ class ChannelFormatConverterStreamT : public AudioStreamX {
         }
 
         void setAudioInfo(AudioBaseInfo cfg) override {
-          AudioStreamX::setAudioInfo(cfg);
+          AudioStream::setAudioInfo(cfg);
           to_channels = cfg.channels;
         }
 
@@ -100,7 +100,7 @@ class ChannelFormatConverterStreamT : public AudioStreamX {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class ChannelFormatConverterStream : public AudioStreamX {
+class ChannelFormatConverterStream : public AudioStream {
   public:
         ChannelFormatConverterStream() = default;
 
@@ -122,7 +122,7 @@ class ChannelFormatConverterStream : public AudioStreamX {
         }
 
         void setAudioInfo(AudioBaseInfo cfg) override {
-          AudioStreamX::setAudioInfo(cfg);
+          AudioStream::setAudioInfo(cfg);
             switch(bits_per_sample){
               case 8:
                  static_cast<ChannelFormatConverterStreamT<int8_t>*>(converter)->setAudioInfo(cfg);
@@ -272,7 +272,7 @@ class ChannelFormatConverterStream : public AudioStreamX {
  */
 
 template<typename TFrom, typename TTo >
-class NumberFormatConverterStreamT : public AudioStreamX {
+class NumberFormatConverterStreamT : public AudioStream {
   public:
         NumberFormatConverterStreamT() = default;
 
@@ -340,7 +340,7 @@ class NumberFormatConverterStreamT : public AudioStreamX {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class NumberFormatConverterStream :  public AudioStreamX {
+class NumberFormatConverterStream :  public AudioStream {
   public:
         NumberFormatConverterStream() = default;
 
@@ -521,7 +521,7 @@ class NumberFormatConverterStream :  public AudioStreamX {
  * @copyright GPLv3
  */
 
-class FormatConverterStream : public AudioStreamX {
+class FormatConverterStream : public AudioStream {
   public:
         FormatConverterStream() = default;
 
diff --git a/src/AudioTools/Fade.h b/src/AudioTools/Fade.h
diff --git a/src/AudioTools/Resample.h b/src/AudioTools/Resample.h
diff --git a/src/AudioTools/VolumeStream.h b/src/AudioTools/VolumeStream.h
diff --git a/src/Experiments/TimeInfoStream.h b/src/Experiments/TimeInfoStream.h

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class AudioOutputWithCallback : public AudioOutput, public BufferedStream {`
`67`	`67`	`* @brief Stream Adapter for ESP8288-Audio AudioOutput`
`68`	`68`	`*`
`69`	`69`	`*/`
`70`		`-class ESP3288AudioOutput : public AudioStreamX {`
	`70`	`+class ESP3288AudioOutput : public AudioStream {`
`71`	`71`	`public:`
`72`	`72`	`ESP3288AudioOutput(AudioOutput &out, int channels) {`
`73`	`73`	`p_out = &out;`