X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=988b8fe9b2f9fc73a6261064e673396365f71bdf;hb=f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81;hp=53a0c31e140d6ceab0a3d2f222fe419bda88237b;hpb=79ce26d031d109177ba4b0f637fa2960345a37a3;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 53a0c31e1..988b8fe9b 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,79 +1,42 @@
 /*
-    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.cc
- *  @brief Parent class for decoders of content.
- */
-
-#include "film.h"
 #include "decoder.h"
-#include "decoded.h"
-
-#include "i18n.h"
+#include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
-
-/** @param f Film.
- *  @param o Decode options.
- */
-Decoder::Decoder (shared_ptr<const Film> f)
-	: _film (f)
-	, _done (false)
-{
-
-}
-
-struct DecodedSorter
-{
-	bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
-	{
-		return a->dcp_time < b->dcp_time;
-	}
-};
+using boost::optional;
 
-shared_ptr<Decoded>
-Decoder::peek ()
+void
+Decoder::maybe_seek (optional<ContentTime>& position, ContentTime time, bool accurate)
 {
-	while (!_done && _pending.empty ()) {
-		_done = pass ();
-	}
-
-	if (_done && _pending.empty ()) {
-		return shared_ptr<Decoded> ();
+	if (!position) {
+		/* A seek has just happened */
+		return;
 	}
 
-	_pending.sort (DecodedSorter ());
-	return _pending.front ();
-}
-
-void
-Decoder::consume ()
-{
-	if (!_pending.empty ()) {
-		_pending.pop_front ();
+	if (time >= *position && time < (*position + ContentTime::from_seconds(1))) {
+		/* No need to seek: caller should just pass() */
+		return;
 	}
-}
 
-void
-Decoder::seek (ContentTime, bool)
-{
-	_pending.clear ();
-	_done = false;
+	position.reset ();
+	seek (time, accurate);
 }