X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=181fc6c2ab8869dc96f5269600f69017d362d631;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=0d35ebb3a01675c3b75e7961f2975154dc4d9724;hpb=aa230169f8b59b7cb2da9a3bbb8ce5f7600285c0;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 0d35ebb3a..181fc6c2a 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,77 +1,74 @@
 /*
-    Copyright (C) 2012 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
+    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 DVDOMATIC_DECODER_H
-#define DVDOMATIC_DECODER_H
-
-#include <vector>
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "util.h"
-#include "stream.h"
-#include "video_source.h"
-#include "audio_source.h"
-
-class Job;
-class DecodeOptions;
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class Film;
-class FilterGraph;
+#ifndef DCPOMATIC_DECODER_H
+#define DCPOMATIC_DECODER_H
+
+#include "types.h"
+#include "dcpomatic_time.h"
+#include <boost/utility.hpp>
+
+class Decoded;
+class VideoDecoder;
+class AudioDecoder;
+class SubtitleDecoder;
 
 /** @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<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
 	virtual ~Decoder () {}
 
-	virtual bool pass () = 0;
-	/** Seek.
-	 *  @return true on error.
+	boost::shared_ptr<VideoDecoder> video;
+	boost::shared_ptr<AudioDecoder> audio;
+	boost::shared_ptr<SubtitleDecoder> subtitle;
+
+	enum PassReason {
+		PASS_REASON_VIDEO,
+		PASS_REASON_AUDIO,
+		PASS_REASON_SUBTITLE
+	};
+
+	/** 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 seek (SourceFrame);
+	virtual void seek (ContentTime time, bool accurate) = 0;
 
-	boost::signals2::signal<void()> OutputChanged;
+	/** @return true if this decoder has already returned all its data and will give no more */
+	virtual bool pass (PassReason, bool accurate) = 0;
 
-protected:
-	/** our Film */
-	boost::shared_ptr<Film> _film;
-	/** our options */
-	boost::shared_ptr<const DecodeOptions> _opt;
-	/** associated Job, or 0 */
-	Job* _job;
+	/** Ensure that any future get() calls return data that reflect
+	 *  changes in our content's settings.
+	 */
+	virtual void reset () {}
 };
 
 #endif