X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.h;h=2117657965f77aec45fc03972980021ce12aedbf;hb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;hp=5794b59516e6767f586cc5d0a33663b2ed9ef376;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index 5794b5951..211765796 100644
--- a/src/lib/dcp_subtitle_content.h
+++ b/src/lib/dcp_subtitle_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +17,10 @@
 
 */
 
-#include "subtitle_content.h"
+#include "dcp_subtitle.h"
+#include "content.h"
 
-class DCPSubtitleContent : public SubtitleContent
+class DCPSubtitleContent : public DCPSubtitle, public Content
 {
 public:
 	DCPSubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -29,15 +30,19 @@ public:
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	DCPTime full_length () const;
 
 	/* SubtitleContent */
-	bool has_subtitles () const {
+
+	bool has_text_subtitles () const {
 		return true;
 	}
 
+	bool has_image_subtitles () const {
+		return false;
+	}
+
 private:
-	DCPTime _length;
+	ContentTime _length;
 };