back to back flac playback is working :)

3 files changed, 12 insertions, 9 deletions

diff --git a/src/audio/include/audio_decoder.hpp b/src/audio/include/audio_decoder.hpp
index 4e7e127e..aa051685 100644
--- a/src/audio/include/audio_decoder.hpp
+++ b/src/audio/include/audio_decoder.hpp
@@ -43,6 +43,7 @@ class AudioDecoder : public IAudioElement {
   std::optional<StreamInfo::Format> current_input_format_;
   std::optional<StreamInfo::Format> current_output_format_;
   std::optional<std::size_t> seek_to_sample_;
+  bool has_prepared_output_;
   bool has_samples_to_send_;
   bool has_input_remaining_;
 
diff --git a/src/audio/include/fatfs_audio_input.hpp b/src/audio/include/fatfs_audio_input.hpp
index ab392f54..77d3b96d 100644
--- a/src/audio/include/fatfs_audio_input.hpp
+++ b/src/audio/include/fatfs_audio_input.hpp
@@ -52,6 +52,7 @@ class FatfsAudioInput : public IAudioElement {
   std::optional<std::future<std::optional<std::string>>> pending_path_;
   FIL current_file_;
   bool is_file_open_;
+  bool has_prepared_output_;
 
   std::optional<database::Encoding> current_container_;
   std::optional<StreamInfo::Format> current_format_;
diff --git a/src/audio/include/stream_info.hpp b/src/audio/include/stream_info.hpp
index 54b87003..4db3e5fd 100644
--- a/src/audio/include/stream_info.hpp
+++ b/src/audio/include/stream_info.hpp
@@ -26,10 +26,9 @@ struct StreamInfo {
   // stream's buffer.
   std::size_t bytes_in_stream{0};
 
-  // The total length of this stream, in case its source is finite (e.g. a
-  // file on disk). May be absent for endless streams (internet streams,
-  // generated audio, etc.)
-  std::optional<std::size_t> length_bytes{};
+  bool is_producer_finished = true;
+
+  bool is_consumer_finished = true;
 
   //
   std::optional<uint32_t> seek_to_seconds{};
@@ -62,10 +61,8 @@ class RawStream {
  public:
   StreamInfo* info;
   cpp::span<std::byte> data;
-  bool is_incomplete;
 
-  RawStream(StreamInfo* i, cpp::span<std::byte> d)
-      : info(i), data(d), is_incomplete(false) {}
+  RawStream(StreamInfo* i, cpp::span<std::byte> d) : info(i), data(d) {}
 };
 
 /*
@@ -78,7 +75,9 @@ class InputStream {
 
   void consume(std::size_t bytes) const;
 
-  void mark_incomplete() const;
+  bool is_producer_finished() const;
+
+  void mark_consumer_finished() const;
 
   const StreamInfo& info() const;
 
@@ -100,7 +99,9 @@ class OutputStream {
 
   cpp::span<std::byte> data() const;
 
-  bool is_incomplete() const;
+  bool is_consumer_finished() const;
+
+  void mark_producer_finished() const;
 
  private:
   RawStream* raw_;