X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.h;h=5eaad0d2fc677efc04b7a7896695d11997284155;hp=05af716906a31b05f96de284c4cbf1df5e62b9b7;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=59e769023c392c332331567a1aea94660002c463

diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index 05af71690..5eaad0d2f 100644
--- a/src/lib/dcp_subtitle_content.h
+++ b/src/lib/dcp_subtitle_content.h
@@ -1,43 +1,38 @@
 /*
-    Copyright (C) 2014-2015 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
+    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/>.
 
 */
 
-#include "subtitle_content.h"
 #include "dcp_subtitle.h"
+#include "content.h"
 
-class DCPSubtitleContent : public SubtitleContent, public DCPSubtitle
+class DCPSubtitleContent : public DCPSubtitle, public Content
 {
 public:
-	DCPSubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	DCPSubtitleContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
+	DCPSubtitleContent (boost::filesystem::path);
+	DCPSubtitleContent (cxml::ConstNodePtr, int);
 
-	/* Content */
-	void examine (boost::shared_ptr<Job>);
+	void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *) const;
-	DCPTime full_length () const;
-
-	/* SubtitleContent */
-	bool has_subtitles () const {
-		return true;
-	}
+	void as_xml (xmlpp::Node *, bool with_paths) const;
+	DCPTime full_length (boost::shared_ptr<const Film> film) const;
 
 private:
-	DCPTime _length;
+	ContentTime _length;
 };