rename method setOutputStream to setOutput

examples/examples-stream/streams-url_flac-i2s/streams-url_flac-i2s.ino

@@ -25,7 +25,7 @@ void setup() {
 
   url.begin("http://www.lindberg.no/hires/test/2L-145_01_stereo_01.cd.flac");
   dec.setInputStream(url);
-  dec.setOutputStream(i2s);
+  dec.setOutput(i2s);
   dec.begin();
 }
 

examples/examples-stream/streams-url_vorbis_i2s/streams-url_vorbis_i2s.ino

@@ -25,7 +25,7 @@ void setup() {
 
   url.begin("http://marmalade.scenesat.com:8086/bitjam.ogg","application/ogg");
   dec.setInputStream(url);
-  dec.setOutputStream(i2s);
+  dec.setOutput(i2s);
   dec.begin();
 }
 

src/AudioCodecs/AudioEncoded.h

@@ -33,19 +33,19 @@ class AudioDecoder : public AudioWriter, public AudioInfoSource {
     }
     info = from;
   }
-  virtual void setOutputStream(AudioStream &out_stream) {
+  virtual void setOutput(AudioStream &out_stream) {
     Print *p_print = &out_stream;
-    setOutputStream(*p_print);
+    setOutput(*p_print);
     setNotifyAudioChange(out_stream);
   }
 
-  virtual void setOutputStream(AudioOutput &out_stream) {
+  virtual void setOutput(AudioOutput &out_stream) {
     Print *p_print = &out_stream;
-    setOutputStream(*p_print);
+    setOutput(*p_print);
     setNotifyAudioChange(out_stream);
   }
 
-  virtual void setOutputStream(Print &out_stream) override {
+  virtual void setOutput(Print &out_stream) override {
     p_print = &out_stream;
   }
   // Th decoding result is PCM data
@@ -95,7 +95,7 @@ class CodecNOP : public AudioDecoder, public AudioEncoder {
 
   virtual void begin() {}
   virtual void end() {}
-  virtual void setOutputStream(Print &out_stream) {}
+  virtual void setOutput(Print &out_stream) {}
   virtual void setNotifyAudioChange(AudioInfoSupport &bi) {}
   virtual void setAudioInfo(AudioInfo info) {}
 
@@ -131,22 +131,22 @@ class StreamingDecoder {
   virtual void end() = 0;
 
   /// Defines the output Stream
-  virtual void setOutputStream(Print &outStream) = 0;
+  virtual void setOutput(Print &outStream) = 0;
 
   /// Register Output Stream to be notified about changes
   virtual void setNotifyAudioChange(AudioInfoSupport &bi) = 0;
 
   /// Defines the output streams and register to be notified
-  virtual void setOutputStream(AudioStream &out_stream) {
+  virtual void setOutput(AudioStream &out_stream) {
     Print *p_print = &out_stream;
-    setOutputStream(*p_print);
+    setOutput(*p_print);
     setNotifyAudioChange(out_stream);
   }
 
   /// Defines the output streams and register to be notified
-  virtual void setOutputStream(AudioOutput &out_stream) {
+  virtual void setOutput(AudioOutput &out_stream) {
     Print *p_print = &out_stream;
-    setOutputStream(*p_print);
+    setOutput(*p_print);
     setNotifyAudioChange(out_stream);
   }
 
@@ -193,7 +193,7 @@ class EncodedAudioOutput : public AudioStream {
     TRACED();
     ptr_out = outputStream;
     decoder_ptr = decoder;
-    decoder_ptr->setOutputStream(*outputStream);
+    decoder_ptr->setOutput(*outputStream);
     decoder_ptr->setNotifyAudioChange(*outputStream);
     writer_ptr = decoder_ptr;
     active = false;
@@ -203,7 +203,7 @@ class EncodedAudioOutput : public AudioStream {
     TRACED();
     ptr_out = outputStream;
     decoder_ptr = decoder;
-    decoder_ptr->setOutputStream(*outputStream);
+    decoder_ptr->setOutput(*outputStream);
     decoder_ptr->setNotifyAudioChange(*outputStream);
     writer_ptr = decoder_ptr;
     active = false;
@@ -213,7 +213,7 @@ class EncodedAudioOutput : public AudioStream {
     TRACED();
     ptr_out = outputStream;
     decoder_ptr = decoder;
-    decoder_ptr->setOutputStream(*outputStream);
+    decoder_ptr->setOutput(*outputStream);
     writer_ptr = decoder_ptr;
     active = false;
   }
@@ -222,7 +222,7 @@ class EncodedAudioOutput : public AudioStream {
     TRACED();
     ptr_out = outputStream;
     encoder_ptr = encoder;
-    encoder_ptr->setOutputStream(*outputStream);
+    encoder_ptr->setOutput(*outputStream);
     writer_ptr = encoder_ptr;
     active = false;
   }
@@ -231,7 +231,7 @@ class EncodedAudioOutput : public AudioStream {
     TRACED();
     ptr_out = outputStream;
     encoder_ptr = encoder;
-    encoder_ptr->setOutputStream(*outputStream);
+    encoder_ptr->setOutput(*outputStream);
     decoder_ptr->setNotifyAudioChange(*outputStream);
     writer_ptr = encoder_ptr;
     active = false;
@@ -241,7 +241,7 @@ class EncodedAudioOutput : public AudioStream {
     TRACED();
     ptr_out = outputStream;
     encoder_ptr = encoder;
-    encoder_ptr->setOutputStream(*outputStream);
+    encoder_ptr->setOutput(*outputStream);
     decoder_ptr->setNotifyAudioChange(*outputStream);
     writer_ptr = encoder_ptr;
     active = false;
@@ -276,10 +276,10 @@ class EncodedAudioOutput : public AudioStream {
   void setOutput(Print *outputStream) {
     ptr_out = outputStream;
     if (decoder_ptr != nullptr) {
-      decoder_ptr->setOutputStream(*ptr_out);
+      decoder_ptr->setOutput(*ptr_out);
     }    
     if (encoder_ptr != nullptr) {
-      encoder_ptr->setOutputStream(*ptr_out);
+      encoder_ptr->setOutput(*ptr_out);
     }
   }
 
@@ -293,7 +293,7 @@ class EncodedAudioOutput : public AudioStream {
     encoder_ptr = encoder;
     writer_ptr = encoder;
     if (ptr_out != nullptr) {
-      encoder_ptr->setOutputStream(*ptr_out);
+      encoder_ptr->setOutput(*ptr_out);
     }
   }
 
@@ -304,7 +304,7 @@ class EncodedAudioOutput : public AudioStream {
     decoder_ptr = decoder;
     writer_ptr = decoder;
     if (ptr_out != nullptr) {
-      decoder_ptr->setOutputStream(*ptr_out);
+      decoder_ptr->setOutput(*ptr_out);
     }
   }
 
@@ -511,7 +511,7 @@ class EncodedAudioStream : public EncodedAudioOutput {
       LOGI("Setup reading support");
       resize();
       // make sure the result goes to out_stream
-      writer_ptr->setOutputStream(queue_stream);
+      writer_ptr->setOutput(queue_stream);
       queue_stream.begin();
     }
   }
@@ -581,12 +581,12 @@ class ContainerTargetPrint : public ContainerTarget {
     if (!active) {
       active = true;
       if (p_writer2 != nullptr) {
-        p_writer1->setOutputStream(print2);
-        p_writer2->setOutputStream(*p_print);
+        p_writer1->setOutput(print2);
+        p_writer2->setOutput(*p_print);
         p_writer1->begin();
         p_writer2->begin();
       } else {
-        p_writer1->setOutputStream(*p_print);
+        p_writer1->setOutput(*p_print);
         p_writer1->begin();
       }
     }

src/AudioCodecs/CodecAACFDK.h

@@ -36,7 +36,7 @@ class AACDecoderFDK : public AudioDecoder  {
         }
 
         /// Defines the output stream
-        void setOutputStream(Print &out_stream){
+        void setOutput(Print &out_stream){
             dec->setOutput(out_stream);
         }
 
@@ -141,7 +141,7 @@ public:
          delete enc;
      }
 
-     void setOutputStream(Print &out_stream){
+     void setOutput(Print &out_stream){
          enc->setOutput(out_stream);
      }
 

src/AudioCodecs/CodecAACHelix.h

@@ -63,7 +63,7 @@ class AACDecoderHelix : public AudioDecoder  {
         }
 
         /// Defines the output Stream
-        virtual void setOutputStream(Print &out_stream){
+        virtual void setOutput(Print &out_stream){
             TRACED();
             if (aac!=nullptr) aac->setOutput(out_stream);
         }

src/AudioCodecs/CodecAPTX.h

@@ -48,7 +48,7 @@ class APTXDecoder : public AudioDecoder {
     ctx = nullptr;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return ctx != nullptr; }
 
@@ -245,7 +245,7 @@ class APTXEncoder : public AudioEncoder {
     }
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return ctx != nullptr; }
 

src/AudioCodecs/CodecBase64.h

@@ -50,11 +50,11 @@ class DecoderBase64 : public AudioDecoder {
    */
   DecoderBase64(Print &out) {
     TRACED();
-    setOutputStream(out);
+    setOutput(out);
   }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out) override { p_print = &out; }
+  void setOutput(Print &out) override { p_print = &out; }
 
   /// We expect new lines to delimit the individual lines
   void setNewLine(Base46Logic logic) { newline_logic = logic; }
@@ -187,7 +187,7 @@ class EncoderBase64 : public AudioEncoder {
   EncoderBase64(Print &out) { p_print = &out; }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_buffeream) override {
+  void setOutput(Print &out_buffeream) override {
     p_print = &out_buffeream;
   }
 

src/AudioCodecs/CodecBasic.h

@@ -30,7 +30,7 @@ public:
    */
   DecoderBasic(Print &out_stream, bool active = true) {
     TRACED();
-    setOutputStream(out_stream);
+    setOutput(out_stream);
   }
 
   /**
@@ -42,13 +42,13 @@ public:
 
   DecoderBasic(Print &out_stream, AudioInfoSupport &bi) {
     TRACED();
-    setOutputStream(out_stream);
+    setOutput(out_stream);
     setNotifyAudioChange(bi);
   }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_stream) override {
-    decoder.setOutputStream(out_stream);
+  void setOutput(Print &out_stream) override {
+    decoder.setOutput(out_stream);
   }
 
   void setNotifyAudioChange(AudioInfoSupport &bi) override {
@@ -93,10 +93,10 @@ public:
   EncoderBasic() {}
 
   // Constructor providing the output stream
-  EncoderBasic(Print &out) { setOutputStream(out); }
+  EncoderBasic(Print &out) { setOutput(out); }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out) override { encoder.setOutputStream(out); }
+  void setOutput(Print &out) override { encoder.setOutput(out); }
 
   /// Provides "audio/pcm"
   const char *mime() override { return "audio/basic"; }

src/AudioCodecs/CodecCodec2.h

@@ -134,7 +134,7 @@ class Codec2Decoder : public AudioDecoder {
     is_active = false;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 
@@ -265,7 +265,7 @@ class Codec2Encoder : public AudioEncoder {
 
   virtual void setAudioInfo(AudioInfo cfg) { this->info = cfg; }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 

src/AudioCodecs/CodecCopy.h

@@ -28,7 +28,7 @@ public:
 
   ~CopyDecoder() {}
 
-  virtual void setOutputStream(Print &out_stream) {pt_print=&out_stream;}
+  virtual void setOutput(Print &out_stream) {pt_print=&out_stream;}
 
   void begin() {}
 
@@ -67,7 +67,7 @@ public:
 
   ~CopyEncoder() {}
 
-  virtual void setOutputStream(Print &out_stream) {pt_print=&out_stream;}
+  virtual void setOutput(Print &out_stream) {pt_print=&out_stream;}
 
   void begin() {}
 

src/AudioCodecs/CodecFLAC.h

@@ -25,7 +25,7 @@ namespace audio_tools {
 
 /**
  * @brief Decoder for FLAC. Depends on https://github.com/pschatzmann/arduino-libflac. We support an efficient streaming API and an very memory intensitiv standard interface. So 
- * you should prefer the streaming interface where you call setOutputStream() before the begin and copy() in the loop.
+ * you should prefer the streaming interface where you call setOutput() before the begin and copy() in the loop.
  * Validated with http://www.2l.no/hires/
  * @ingroup codecs
  * @ingroup decoder
@@ -106,7 +106,7 @@ class FLACDecoder : public StreamingDecoder {
     p_input = &input;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 
@@ -290,7 +290,7 @@ class FLACEncoder : public AudioEncoder {
   int compressionLevel() {return flac_compression_level;}
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   /// Provides "audio/pcm"
   const char *mime() override { return "audio/flac"; }

src/AudioCodecs/CodecFloat.h

@@ -46,7 +46,7 @@ class DecoderFloat : public AudioDecoder {
         }
 
         /// Defines the output Stream
-        void setOutputStream(Print &out_stream) override {
+        void setOutput(Print &out_stream) override {
             p_print = &out_stream;
         }
 
@@ -122,7 +122,7 @@ class EncoderFloat : public AudioEncoder {
         }
 
         /// Defines the output Stream
-        void setOutputStream(Print &out_stream) override {
+        void setOutput(Print &out_stream) override {
             p_print = &out_stream;
         }
 

src/AudioCodecs/CodecG722.h

@@ -71,7 +71,7 @@ class G722Decoder : public AudioDecoder {
     p_notify = &bi;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 
@@ -171,7 +171,7 @@ class G722Encoder : public AudioEncoder {
 
   virtual void setAudioInfo(AudioInfo cfg) { this->cfg = cfg; }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 

src/AudioCodecs/CodecG7xx.h

@@ -86,7 +86,7 @@ class G7xxDecoder : public AudioDecoder {
     p_notify = &bi;
   }
 
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 
@@ -193,7 +193,7 @@ class G7xxEncoder : public AudioEncoder {
     }
   }
 
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 

src/AudioCodecs/CodecGSM.h

@@ -63,7 +63,7 @@ class GSMDecoder : public AudioDecoder {
     p_notify = &bi;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 
@@ -165,7 +165,7 @@ class GSMEncoder : public AudioEncoder {
 
   virtual void setAudioInfo(AudioInfo cfg) { this->cfg = cfg; }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 

src/AudioCodecs/CodecHelix.h

@@ -34,7 +34,7 @@ public:
   ~DecoderHelix() { resetDecoder(); }
 
   /// Defines the output Stream
-  virtual void setOutputStream(Print &outStream) { p_out_stream = &outStream; }
+  virtual void setOutput(Print &outStream) { p_out_stream = &outStream; }
 
   /// Starts the processing
   void begin() {
@@ -96,7 +96,7 @@ protected:
       LOGW("Unknown Data Format: Content will be ignored...")
       p_decoder = CodecNOP::instance();
     }
-    p_decoder->setOutputStream(*p_out_stream);
+    p_decoder->setOutput(*p_out_stream);
     p_decoder->setNotifyAudioChange(*p_bi);
   }
 

src/AudioCodecs/CodecILBC.h

@@ -71,7 +71,7 @@ class ILBCDecoder : public AudioDecoder {
     notify = &bi;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return p_ilbc != nullptr; }
 
@@ -172,7 +172,7 @@ class ILBCEncoder : public AudioEncoder {
 
   virtual const char *mime() { return "audio/ilbc"; }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return p_ilbc != nullptr; }
 

src/AudioCodecs/CodecL16.h

@@ -39,12 +39,12 @@ public:
 
   DecoderL16(Print &out_stream, AudioInfoSupport &bi) {
     TRACED();
-    setOutputStream(out_stream);
+    setOutput(out_stream);
     setNotifyAudioChange(bi);
   }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   void setNotifyAudioChange(AudioInfoSupport &bi) override { this->bid = &bi; }
 
@@ -108,7 +108,7 @@ public:
   EncoderL16(Print &out) { p_print = &out; }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   /// Provides "audio/pcm"
   const char *mime() override { return "audio/l16"; }

src/AudioCodecs/CodecL8.h

@@ -47,7 +47,7 @@ class DecoderL8 : public AudioDecoder {
 
   DecoderL8(Print &out_stream, AudioInfoSupport &bi) {
     TRACED();
-    setOutputStream(out_stream);
+    setOutput(out_stream);
     setNotifyAudioChange(bi);
   }
 
@@ -152,7 +152,7 @@ class EncoderL8 : public AudioEncoder {
   void setSigned(bool isSigned) { is_signed = isSigned; }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   /// Provides "audio/pcm"
   const char *mime() override { return "audio/l8"; }

src/AudioCodecs/CodecLC3.h

@@ -98,7 +98,7 @@ class LC3Decoder : public AudioDecoder {
     p_notify = &bi;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return active; }
 
@@ -251,7 +251,7 @@ class LC3Encoder : public AudioEncoder {
 
   virtual void setAudioInfo(AudioInfo info) { this->info = info; }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return lc3_encoder != nullptr; }
 

src/AudioCodecs/CodecMP3Helix.h

@@ -38,7 +38,7 @@ class MP3DecoderHelix : public AudioDecoder  {
             if (mp3==nullptr){
                 LOGE("Not enough memory for libhelix");
             }
-            setOutputStream(out_stream);
+            setOutput(out_stream);
         }  
 
         /**
@@ -55,7 +55,7 @@ class MP3DecoderHelix : public AudioDecoder  {
             if (mp3==nullptr){
                 LOGE("Not enough memory for libhelix");
             }
-            setOutputStream(out_stream);
+            setOutput(out_stream);
             setNotifyAudioChange(bi);
         }  
 
@@ -68,7 +68,7 @@ class MP3DecoderHelix : public AudioDecoder  {
         }
 
         /// Defines the output Stream
-        virtual void setOutputStream(Print &outStream){
+        virtual void setOutput(Print &outStream){
             if (mp3!=nullptr) mp3->setOutput(outStream);
         }
 

src/AudioCodecs/CodecMP3LAME.h

@@ -47,7 +47,7 @@ public:
      }
 
     /// Defines the output stream
-    void setOutputStream(Print &out_stream){
+    void setOutput(Print &out_stream){
         TRACED();
         p_print = &out_stream;
         if (enc!=nullptr){
@@ -138,7 +138,7 @@ protected:
         if (enc==nullptr){
             enc = new liblame::MP3EncoderLAME();
             if (p_print!=nullptr){
-                setOutputStream(*p_print);
+                setOutput(*p_print);
             } else {
                 LOGE("Output undefined");
             }

src/AudioCodecs/CodecMP3MAD.h

@@ -44,7 +44,7 @@ class MP3DecoderMAD : public AudioDecoder  {
             delete mad;
         }
 
-        void setOutputStream(Print &out){
+        void setOutput(Print &out){
             TRACED();
             mad->setOutput(out);
         }

src/AudioCodecs/CodecMP3Mini.h

@@ -61,7 +61,7 @@ class MP3DecoderMini : public AudioDecoder {
   }
 
   /// Defines the output Stream
-  void setOutputStream(Print &outStream) { this->out = &outStream; }
+  void setOutput(Print &outStream) { this->out = &outStream; }
 
   /// Provides the last available MP3FrameInfo
   AudioInfo audioInfo() { return audio_info; }

src/AudioCodecs/CodecOpus.h

@@ -124,11 +124,11 @@ class OpusAudioDecoder : public AudioDecoder {
    */
   OpusAudioDecoder(Print &out_stream) {
     TRACED();
-    setOutputStream(out_stream);
+    setOutput(out_stream);
   }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   void setNotifyAudioChange(AudioInfoSupport &bi) override {
     this->p_notify = &bi;
@@ -224,10 +224,10 @@ class OpusAudioEncoder : public AudioEncoder {
   OpusAudioEncoder() {}
 
   // Constructor providing the output stream
-  OpusAudioEncoder(Print &out) { setOutputStream(out); }
+  OpusAudioEncoder(Print &out) { setOutput(out); }
 
   /// Defines the output Stream
-  void setOutputStream(Print &out_stream) override { p_print = &out_stream; }
+  void setOutput(Print &out_stream) override { p_print = &out_stream; }
 
   /// Provides "audio/pcm"
   const char *mime() override { return "audio/opus"; }

src/AudioCodecs/CodecSBC.h

@@ -57,7 +57,7 @@ public:
     p_notify = &bi;
   }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 
@@ -270,7 +270,7 @@ public:
 
   virtual void setAudioInfo(AudioInfo info) { this->info = info; }
 
-  virtual void setOutputStream(Print &out_stream) { p_print = &out_stream; }
+  virtual void setOutput(Print &out_stream) { p_print = &out_stream; }
 
   operator bool() { return is_active; }
 

src/AudioCodecs/CodecVorbis.h

@@ -61,7 +61,7 @@ public:
   }
 
   /// Defines the output Stream
-  void setOutputStream(Print &outStream) override { this->p_out = &outStream; }
+  void setOutput(Print &outStream) override { this->p_out = &outStream; }
 
   /// Defines the output Stream
   void setInputStream(Stream &inStream) override { this->p_in = &inStream; }

src/AudioCodecs/CodecWAV.h

@@ -272,7 +272,7 @@ class WAVDecoder : public AudioDecoder {
         }
 
         /// Defines the output Stream
-        void setOutputStream(Print &out_stream){
+        void setOutput(Print &out_stream){
             this->out = &out_stream;
         }
 
@@ -411,7 +411,7 @@ class WAVEncoder : public AudioEncoder {
         }
 
         /// Defines the otuput stream
-        void setOutputStream(Print &out){
+        void setOutput(Print &out){
             stream_ptr = &out;
         }
 

src/AudioCodecs/CodecWavIMA.h

@@ -323,7 +323,7 @@ class WavIMADecoder : public AudioDecoder {
         }
 
         /// Defines the output Stream
-        void setOutputStream(Print &out_stream) {
+        void setOutput(Print &out_stream) {
             this->out = &out_stream;
         }
 

src/AudioCodecs/ContainerAVI.h

@@ -280,7 +280,7 @@ public:
   }
 
   /// Defines the audio output stream - usually called by EncodedAudioStream
-  virtual void setOutputStream(Print &out_stream) override {
+  virtual void setOutput(Print &out_stream) override {
     // p_output_audio = &out_stream;
     p_output_audio->setOutput(&out_stream);
   }

src/AudioCodecs/ContainerBinary.h

@@ -73,8 +73,8 @@ class BinaryContainerEncoder : public AudioEncoder {
   BinaryContainerEncoder(AudioEncoder &encoder) { p_codec = &encoder; }
   BinaryContainerEncoder(AudioEncoder *encoder) { p_codec = encoder; }
 
-  void setOutputStream(Print &outStream) {
-    LOGD("BinaryContainerEncoder::setOutputStream: %d",is_initial_output);
+  void setOutput(Print &outStream) {
+    LOGD("BinaryContainerEncoder::setOutput: %d",is_initial_output);
     if (is_initial_output) {
       setupIntialOutputStream(outStream);
     } else {
@@ -197,8 +197,8 @@ class BinaryContainerDecoder : public AudioDecoder {
   // Defines the output: this method is called 2 times: first to define
   // output defined in the EnocdedAudioStream and then to define the
   // real output in the output chain.
-  void setOutputStream(Print &outStream) {
-    LOGD("BinaryContainerDecoder::setOutputStream: %d",is_initial_output);
+  void setOutput(Print &outStream) {
+    LOGD("BinaryContainerDecoder::setOutput: %d",is_initial_output);
     if (is_initial_output) {
       setupIntialOutputStream(outStream);
     } else {

src/AudioCodecs/ContainerOgg.h

@@ -44,7 +44,7 @@ class OggContainerDecoder : public AudioDecoder {
   }
 
   /// Defines the output Stream
-  void setOutputStream(Print &print) override { out.setOutput(&print); }
+  void setOutput(Print &print) override { out.setOutput(&print); }
 
   void setNotifyAudioChange(AudioInfoSupport &bi) override {
     out.setNotifyAudioChange(bi);
@@ -363,7 +363,7 @@ class OggContainerEncoder : public AudioEncoder {
   OggContainerEncoder(AudioEncoder &encoder) { setEncoder(&encoder); }
 
   /// Defines the output Stream
-  void setOutputStream(Print &print) override { p_ogg->setOutput(print); }
+  void setOutput(Print &print) override { p_ogg->setOutput(print); }
 
   /// Provides "audio/pcm"
   const char *mime() override { return mime_pcm; }
@@ -384,7 +384,7 @@ class OggContainerEncoder : public AudioEncoder {
     TRACED();
     p_ogg->begin();
     if (p_codec != nullptr) {
-      p_codec->setOutputStream(*p_ogg);
+      p_codec->setOutput(*p_ogg);
       p_codec->begin(p_ogg->audioInfo());
     }
   }

src/AudioLibs/RTSP.h

@@ -521,13 +521,13 @@ public:
     buffer.resize(buffer_size);
     p_format = &format;
     p_encoder = &encoder;
-    p_encoder->setOutputStream(buffer);
+    p_encoder->setOutput(buffer);
   }
 
   /// Construcor using RTSPFormatPCM and no encoder
   RTSPOutput(int buffer_size = 1024) {
     buffer.resize(buffer_size);
-    p_encoder->setOutputStream(buffer);
+    p_encoder->setOutput(buffer);
   }
 
   AudioStreamer *streamer() { return &rtsp_streamer; }

src/AudioTools/AudioTypes.h

@@ -131,7 +131,7 @@ class AudioWriter {
     public: 
         virtual size_t write(const void *in_ptr, size_t in_size) = 0;
         virtual void setAudioInfo(AudioInfo from) = 0;
-        virtual void setOutputStream(Print &out_stream) = 0;
+        virtual void setOutput(Print &out_stream) = 0;
         virtual operator bool() = 0;
         virtual void begin() = 0;
         virtual void begin(AudioInfo info) {

src/Experiments/CodecGGWave.h

@@ -41,7 +41,7 @@ public:
 
   GGWaveDecoder(Print &out_stream) : GGWaveDecoder() { TRACED(); pt_print=&out_stream; }
 
-  virtual void setOutputStream(Print &out_stream) {pt_print=&out_stream;}
+  virtual void setOutput(Print &out_stream) {pt_print=&out_stream;}
 
   AudioInfo audioInfo() { return info; }
   
@@ -189,7 +189,7 @@ public:
 
   void setAudioInfo(AudioInfo ai) { info = ai; }
 
-  void setOutputStream(Print &out_stream) {pt_print=&out_stream;}
+  void setOutput(Print &out_stream) {pt_print=&out_stream;}
 
   void setSamplesFormatInput(ggwave_SampleFormat fmt){
     samples_format_input = fmt;