Rename AudioOutput.h to AudioPrint.h

pschatzmann · pschatzmann · commit 43d32de463b7 · 2022-09-17T11:50:22.000+02:00
diff --git a/src/AudioCodecs/AudioEncoded.h b/src/AudioCodecs/AudioEncoded.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "AudioConfig.h"
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 #include "AudioTools/AudioStreams.h"
 #include "AudioTools/AudioTypes.h"
 #include "Stream.h"
diff --git a/src/AudioFilter/Equilizer.h b/src/AudioFilter/Equilizer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <math.h>
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 #include "AudioBasic/Int24.h"
 
 namespace audio_tools {
diff --git a/src/AudioLibs/AudioA2DP.h b/src/AudioLibs/AudioA2DP.h
@@ -257,11 +257,16 @@ class A2DPStream : public AudioStream {
         }
        
         virtual int available() {
-            return a2dp_buffer==nullptr ? 0 : a2dp_buffer->available();
+            // only supported in tx mode
+            if (config.mode!=RX_MODE || a2dp_buffer==nullptr ) return 0;
+            return a2dp_buffer->available();
         }
 
         virtual int availableForWrite() {
-            return a2dp_buffer==nullptr ? 0 : a2dp_buffer->availableForWrite();
+            // only supported in tx mode
+            if (config.mode!=TX_MODE || a2dp_buffer==nullptr ) return 0;
+            // return infor from buffer
+            return a2dp_buffer->availableForWrite();
         }
 
         // Define the volme (values between 0.0 and 1.0)
diff --git a/src/AudioLibs/AudioESP8266.h b/src/AudioLibs/AudioESP8266.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "AudioConfig.h"
-#include "AudioOutput.h"
+#include "AudioPrint.h"
 #include "AudioTools.h"
 #include "SoundData.h"
 
diff --git a/src/AudioLibs/AudioFFT.h b/src/AudioLibs/AudioFFT.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 #include "AudioLibs/FFT/FFTWindows.h"
 
 namespace audio_tools {
diff --git a/src/AudioLibs/AudioServerEx.h b/src/AudioLibs/AudioServerEx.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "AudioConfig.h"
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 #include "AudioCodecs/CodecWAV.h"
 #include "HttpServer.h"
 #include "HttpExtensions.h"
diff --git a/src/AudioLibs/TfLiteAudioStream.h b/src/AudioLibs/TfLiteAudioStream.h
@@ -6,7 +6,7 @@
 #include <TensorFlowLite.h>
 #include <cmath>
 #include <cstdint>
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 #include "AudioTools/Buffers.h"
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/experimental/microfrontend/lib/frontend.h"
diff --git a/src/AudioPWM/PWMAudioBase.h b/src/AudioPWM/PWMAudioBase.h
@@ -3,7 +3,7 @@
 #include "AudioConfig.h"
 #include "AudioTools.h"
 #include "AudioTools/AudioLogger.h"
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 #include "AudioBasic/Collections.h"
 #include "Stream.h"
 
diff --git a/src/AudioTools.h b/src/AudioTools.h
@@ -21,7 +21,7 @@
 #include "AudioTools/AudioLogger.h"
 #include "AudioTools/AudioStreams.h"
 #include "AudioTools/AudioStreamsConverter.h"
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 #include "AudioTools/Resample.h"
 #include "AudioTools/AudioCopy.h"
 #include "AudioMetaData/MetaData.h"
diff --git a/src/AudioTools/AudioCopy.h b/src/AudioTools/AudioCopy.h
@@ -92,7 +92,7 @@ class StreamCopyT {
             // if not initialized we do nothing
             if (from==nullptr || to==nullptr) return 0;
 
-            // // If we try to write to a server we might not have any output destination yet
+            // E.g. if we try to write to a server we might not have any output destination yet
             int to_write = to->availableForWrite();
             if (to_write==0){
                  delay(500);
diff --git a/src/AudioTools/AudioPrint.h b/src/AudioTools/AudioPrint.h
@@ -1,4 +1,4 @@
-pw#pragma once
+#pragma once
 #include "Arduino.h"
 #include "AudioConfig.h"
 #include "AudioTools/AudioTypes.h"
@@ -29,7 +29,7 @@ class AudioPrint : public Print, public AudioBaseInfoDependent, public AudioBase
         }
 
         virtual int availableForWrtie() {
-            return 0;
+            return DEFAULT_BUFFER_SIZE;
         }
 
         void flush()  {
diff --git a/src/AudioTools/AudioStreams.h b/src/AudioTools/AudioStreams.h
@@ -66,6 +66,8 @@ class AudioStream : public Stream, public AudioBaseInfoDependent, public AudioBa
     return info;
   }
 
+  virtual int availableForWrite() override { return DEFAULT_BUFFER_SIZE; }
+
   virtual void flush() {}
 
  protected:
@@ -90,7 +92,6 @@ class AudioStreamX : public AudioStream {
   virtual size_t write(const uint8_t *buffer, size_t size) override{ return not_supported(0); }
   virtual size_t write(uint8_t) override { return not_supported(0); }
   virtual int available() override { return not_supported(0); };
-  virtual int availableForWrite() override { return DEFAULT_BUFFER_SIZE; }
 
   virtual int read() override { return not_supported(-1); }
   virtual int peek() override { return not_supported(-1); }
diff --git a/src/Experiments/AudioDAC.h b/src/Experiments/AudioDAC.h
@@ -3,7 +3,7 @@
 #include "AudioTools/AudioLogger.h"
 #include "AudioTools/Buffers.h"
 #include "AudioTimer/AudioTimer.h"
-#include "AudioTools/AudioOutput.h"
+#include "AudioTools/AudioPrint.h"
 
 namespace audio_tools {
 

Original file line number	Diff line number	Diff line change
`@@ -257,11 +257,16 @@ class A2DPStream : public AudioStream {`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`virtual int available() {`
`260`		`- return a2dp_buffer==nullptr ? 0 : a2dp_buffer->available();`
	`260`	`+ // only supported in tx mode`
	`261`	`+ if (config.mode!=RX_MODE \|\| a2dp_buffer==nullptr ) return 0;`
	`262`	`+ return a2dp_buffer->available();`
`261`	`263`	`}`
`262`	`264`
`263`	`265`	`virtual int availableForWrite() {`
`264`		`- return a2dp_buffer==nullptr ? 0 : a2dp_buffer->availableForWrite();`
	`266`	`+ // only supported in tx mode`
	`267`	`+ if (config.mode!=TX_MODE \|\| a2dp_buffer==nullptr ) return 0;`
	`268`	`+ // return infor from buffer`
	`269`	`+ return a2dp_buffer->availableForWrite();`
`265`	`270`	`}`
`266`	`271`
`267`	`272`	`// Define the volme (values between 0.0 and 1.0)`