X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.h;h=c29944605f6f359525d6e4e375827847a847e026;hp=5794b59516e6767f586cc5d0a33663b2ed9ef376;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f

diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index 5794b5951..c29944605 100644
--- a/src/lib/dcp_subtitle_content.h
+++ b/src/lib/dcp_subtitle_content.h
@@ -1,43 +1,38 @@
 /*
-    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
+    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
+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);
 
-	/* Content */
 	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 {
-		return true;
-	}
-
 private:
-	DCPTime _length;
+	ContentTime _length;
 };