X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=785fb96f0c2ed4b0b7637abba296bcbb61ca40b1;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=4e136d619e075b3d49f52e147365ded667cd3d15;hpb=521c09170d9e62cd72cc2da66c41816761008a4b;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 4e136d619..785fb96f0 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,70 +1,44 @@
 /*
-    Copyright (C) 2012 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.cc
- *  @brief Parent class for decoders of content.
- */
-
-#include "film.h"
 #include "decoder.h"
-#include "decoded.h"
-
-#include "i18n.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_decoder.h"
 
-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)
+ContentTime
+Decoder::position () const
 {
+	ContentTime pos;
 
-}
-
-shared_ptr<Decoded>
-Decoder::peek ()
-{
-	while (!_done && _pending.empty ()) {
-		_done = pass ();
+	if (video && video->position()) {
+		pos = min (pos, video->position().get());
 	}
 
-	if (_done) {
-		return shared_ptr<Decoded> ();
+	if (audio && audio->position()) {
+		pos = min (pos, audio->position().get());
 	}
 
-	return _pending.front ();
-}
-
-void
-Decoder::consume ()
-{
-	if (!_pending.empty ()) {
-		_pending.pop_front ();
+	if (subtitle && subtitle->position()) {
+		pos = min (pos, subtitle->position().get());
 	}
-}
 
-void
-Decoder::seek (ContentTime, bool)
-{
-	_pending.clear ();
-	_done = false;
+	return pos;
 }