From 27b83475435dda4e84a90cf59a52f150905c4ab1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 19 Jul 2018 22:44:53 +0100
Subject: Clean up after previous commit.

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

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index e7e6b8620..70eb5b61a 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,7 +21,7 @@
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "text_decoder.h"
+#include "caption_decoder.h"
 #include <boost/optional.hpp>
 #include <iostream>
 
@@ -42,8 +42,8 @@ Decoder::position () const
 		pos = audio->position();
 	}
 
-	if (subtitle && !subtitle->ignore() && (!pos || subtitle->position() < *pos)) {
-		pos = subtitle->position();
+	if (caption && !caption->ignore() && (!pos || caption->position() < *pos)) {
+		pos = caption->position();
 	}
 
 	return pos.get_value_or(ContentTime());
@@ -58,7 +58,7 @@ Decoder::seek (ContentTime, bool)
 	if (audio) {
 		audio->seek ();
 	}
-	if (subtitle) {
-		subtitle->seek ();
+	if (caption) {
+		caption->seek ();
 	}
 }
-- 
cgit v1.2.3