Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index aeb39d0b2a05483cc2afe5f736e0534d44658d5d..8378373c6e0e29c8c4ed45943a30a6817651ed2e 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/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
@@ -18,19 +18,16 @@
 */
 
 /** @file  src/decoder.h
- *  @brief Parent class for decoders of content.
+ *  @brief Decoder class.
  */
 
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/utility.hpp>
 #include "types.h"
 #include "dcpomatic_time.h"
+#include <boost/utility.hpp>
 
-class Film;
 class Decoded;
 
 /** @class Decoder.
@@ -39,39 +36,22 @@ class Decoded;
 class Decoder : public boost::noncopyable
 {
 public:
-       Decoder (boost::shared_ptr<const Film>);
        virtual ~Decoder () {}
 
-       /** Seek so that the next peek() will yield the next thing
-        *  (video/sound frame, subtitle etc.) at or after the requested
-        *  time.  Pass accurate = true to try harder to get close to
-        *  the request.
-        */
-       virtual void seek (ContentTime time, bool accurate);
-       
-       boost::shared_ptr<Decoded> peek ();
-
-       /* Consume the last peek()ed thing so that it won't be returned
-        * from the next peek().
-        */
-       void consume ();
-
 protected:
+       friend class AudioDecoderStream;
 
-       /** Perform one decode pass of the content, which may or may not
-        *  result in a complete quantum (Decoded object) of decoded stuff
-        *  being added to _pending.
-        *  @return true if the decoder is done (i.e. no more data will be
-        *  produced by any future calls to pass() without a seek() first).
+       /** Seek so that the next pass() will yield the next thing
+        *  (video/sound frame, subtitle etc.) at or after the requested
+        *  time.  Pass accurate = true to try harder to ensure that, at worst,
+        *  the next thing we yield comes before `time'.  This may entail
+        *  seeking some way before `time' to be on the safe side.
+        *  Alternatively, if seeking is 100% accurate for this decoder,
+        *  it may seek to just the right spot.
         */
-       virtual bool pass () = 0;
-       virtual void flush () {};
-       
-       /** The Film that we are decoding in */
-       boost::weak_ptr<const Film> _film;
+       virtual void seek (ContentTime time, bool accurate) = 0;
 
-       std::list<boost::shared_ptr<Decoded> > _pending;
-       bool _done;
+       virtual bool pass () = 0;
 };
 
 #endif