From 254b3044d72de6b033d7c584f5abd2b9aa70aad5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 21 Nov 2018 01:59:04 +0000
Subject: Take Film pointer out of Content.

---
 src/lib/decoder.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/lib/decoder.cc')

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 6078141dc..fb7663f5c 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -31,21 +31,21 @@ using boost::shared_ptr;
 
 /** @return Earliest time of content that the next pass() will emit */
 ContentTime
-Decoder::position () const
+Decoder::position (shared_ptr<const Film> film) const
 {
 	optional<ContentTime> pos;
 
-	if (video && !video->ignore() && (!pos || video->position() < *pos)) {
-		pos = video->position();
+	if (video && !video->ignore() && (!pos || video->position(film) < *pos)) {
+		pos = video->position(film);
 	}
 
-	if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) {
-		pos = audio->position();
+	if (audio && !audio->ignore() && (!pos || audio->position(film) < *pos)) {
+		pos = audio->position(film);
 	}
 
 	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
-		if (!i->ignore() && (!pos || i->position() < *pos)) {
-			pos = i->position();
+		if (!i->ignore() && (!pos || i->position(film) < *pos)) {
+			pos = i->position(film);
 		}
 	}
 
@@ -53,7 +53,7 @@ Decoder::position () const
 }
 
 void
-Decoder::seek (ContentTime, bool)
+Decoder::seek (shared_ptr<const Film>, ContentTime, bool)
 {
 	if (video) {
 		video->seek ();
-- 
cgit v1.2.3