Untested merge of master.

[dcpomatic.git] / src / lib / sndfile_decoder.h

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index e16eab6731e2f23d4bc32e9f4e6dfd1a8c2fced7..b999a66d15f40644bb0313614c5d9c771e7b17cf 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -20,35 +20,28 @@
 #include <sndfile.h>
 #include "decoder.h"
 #include "audio_decoder.h"
-#include "stream.h"
 
-class SndfileStream : public AudioStream
-{
-public:
-       SndfileStream (int sample_rate, int64_t layout)
-               : AudioStream (sample_rate, layout)
-       {}
-                              
-       std::string to_string () const;
-
-       static boost::shared_ptr<SndfileStream> create ();
-       static boost::shared_ptr<SndfileStream> create (std::string t, boost::optional<int> v);
-
-private:
-       friend class stream_test;
-       
-       SndfileStream ();
-       SndfileStream (std::string t, boost::optional<int> v);
-};
+class SndfileContent;
 
 class SndfileDecoder : public AudioDecoder
 {
 public:
-       SndfileDecoder (boost::shared_ptr<Film>, DecodeOptions);
+       SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
+       ~SndfileDecoder ();
 
        bool pass ();
 
+       int audio_channels () const;
+       ContentAudioFrame audio_length () const;
+       int audio_frame_rate () const;
+
 private:
-       std::vector<SNDFILE*> open_files (sf_count_t &);
-       void close_files (std::vector<SNDFILE*> const &);
+       SNDFILE* open_file (sf_count_t &);
+       void close_file (SNDFILE*);
+
+       boost::shared_ptr<const SndfileContent> _sndfile_content;
+       SNDFILE* _sndfile;
+       SF_INFO _info;
+       ContentAudioFrame _done;
+       ContentAudioFrame _remaining;
 };