Merge master.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 02ccaa42b761748d9e802a6e51309bba5a083b8d..df3ac4f39c4a734b9c433673e36ff2500b50d774 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 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,54 +24,31 @@
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include <vector>
-#include <string>
-#include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "util.h"
-#include "video_source.h"
-#include "audio_source.h"
-#include "film.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/utility.hpp>
+#include "types.h"
+#include "dcpomatic_time.h"
 
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class FilterGraph;
+class Decoded;
+class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
- *
- *  These classes can be instructed run through their content (by
- *  calling ::go), and they emit signals when video or audio data is
- *  ready for something else to process.
  */
-class Decoder
+class Decoder : public boost::noncopyable
 {
 public:
-       Decoder (boost::shared_ptr<const Film>);
        virtual ~Decoder () {}
 
+protected:     
+       /** 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) = 0;
        virtual bool pass () = 0;
-       virtual bool seek (double);
-       virtual bool seek_back () {
-               return true;
-       }
-       virtual bool seek_forward () {
-               return true;
-       }
-
-       boost::signals2::signal<void()> OutputChanged;
-
-protected:
-       boost::shared_ptr<const Film> _film;
-
-private:
-       virtual void film_changed (Film::Property) {}
-
-       boost::signals2::scoped_connection _film_connection;
 };
 
 #endif