X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fdecoder.h;h=d87ff610ac47d3a9eae2eb795ac072a397c26b3f;hb=a93d6e9872f0de79f5d612320837a1fc9d557f63;hp=b550bf5cbe55e990eadd13aa95baab47a7f3f010;hpb=f45cbb73068321d857249aaa21f770b87493c7c2;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index b550bf5cb..d87ff610a 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,90 +1,59 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 /** @file  src/decoder.h
- *  @brief Parent class for decoders of content.
+ *  @brief Decoder class.
  */
 
 #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 "video_source.h"
-#include "audio_source.h"
-#include "film.h"
+#include "types.h"
+#include "dcpomatic_time.h"
+#include <boost/utility.hpp>
 
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class FilterGraph;
+class Decoded;
+class VideoDecoder;
+class AudioDecoder;
+class SubtitleDecoder;
+class DecoderPart;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder
+class Decoder : public boost::noncopyable
 {
 public:
-	Decoder (boost::shared_ptr<const Film>);
 	virtual ~Decoder () {}
 
-	/** Perform one decode pass of the content, which may or may not
-	 *  cause the object to emit some data.
-	 */
-	virtual void pass () = 0;
+	boost::shared_ptr<VideoDecoder> video;
+	boost::shared_ptr<AudioDecoder> audio;
+	boost::shared_ptr<SubtitleDecoder> subtitle;
 
-	/** Seek this decoder to as close as possible to some time,
-	 *  expressed relative to our source's start.
-	 *  @param t Time.
-	 *  @param a true to try hard to be accurate, otherwise false.
+	/** Do some decoding and perhaps emit video, audio or subtitle data.
+	 *  @return true if this decoder will emit no more data unless a seek() happens.
 	 */
-	virtual void seek (Time) = 0;
-
-	/** Seek back one video frame */
-	virtual void seek_back () = 0;
-
-	/** Seek forward one video frame */
-	virtual void seek_forward () = 0;
-
-	/** @return Approximate time of the next content that we will emit,
-	 *  expressed relative to the start of our source.
-	 */
-	virtual Time next () const = 0;
-
-	virtual bool done () const = 0;
-
-protected:
-
-	/** The Film that we are decoding in */
-	boost::weak_ptr<const Film> _film;
-
-private:
-	/** This will be called when our Film emits Changed */
-	virtual void film_changed (Film::Property) {}
+	virtual bool pass () = 0;
+	virtual void seek (ContentTime time, bool accurate);
 
-	/** Connection to our Film */
-	boost::signals2::scoped_connection _film_connection;
+	ContentTime position () const;
 };
 
 #endif