Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 4ecea0846ef030ea22324c53e93d9be785958db6..da9016ee09a958c26211df60e4ae68b6a1d9620d 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,34 +17,22 @@
 
 */
 
-#include <sndfile.h>
-#include "decoder.h"
 #include "audio_decoder.h"
+#include "sndfile_base.h"
 
 class SndfileContent;
 
-class SndfileDecoder : public AudioDecoder
+class SndfileDecoder : public Sndfile, public AudioDecoder
 {
 public:
-       SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
+       SndfileDecoder (boost::shared_ptr<const SndfileContent> c, bool fast);
        ~SndfileDecoder ();
 
-       void seek (ContentTime, bool);
-
-       int audio_channels () const;
-       AudioFrame audio_length () const;
-       int audio_frame_rate () const;
-
 private:
-       ContentTime first_audio () const {
-               return 0;
-       }
-
        bool pass ();
-       
-       boost::shared_ptr<const SndfileContent> _sndfile_content;
-       SNDFILE* _sndfile;
-       SF_INFO _info;
-       AudioFrame _remaining;
+       void seek (ContentTime, bool);
+
+       int64_t _done;
+       int64_t _remaining;
        float* _deinterleave_buffer;
 };