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 18f612e538c5e645470c33cfcca91175a58a0b13..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
@@ -24,11 +24,9 @@
 #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 Decoded;
 
@@ -40,15 +38,19 @@ class Decoder : public boost::noncopyable
 public:
        virtual ~Decoder () {}
 
-protected:     
+protected:
+       friend class AudioDecoderStream;
+
        /** 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 get close to
-        *  the request.  Note that seeking to time t may mean that
-        *  the next pass() yields, for example, audio at time t and then
-        *  video before it.
+        *  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 void seek (ContentTime time, bool accurate) = 0;
+
        virtual bool pass () = 0;
 };