X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_subtitle_content.h;h=fd0bad12a310957ff23e657d4cfe2e9e313278c4;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=ad63a0e7d7f13558489b8a8d6ea9ad505caff87b;hpb=4557d71347d597ddd4a1b5bc04776ffe3c3f3483;p=dcpomatic.git

diff --git a/src/lib/text_subtitle_content.h b/src/lib/text_subtitle_content.h
index ad63a0e7d..fd0bad12a 100644
--- a/src/lib/text_subtitle_content.h
+++ b/src/lib/text_subtitle_content.h
@@ -1,36 +1,31 @@
 /*
-    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 "content.h"
 
-class TextSubtitleContentProperty
-{
-public:
-	static int const TEXT_SUBTITLE_COLOUR;
-	static int const TEXT_SUBTITLE_OUTLINE;
-	static int const TEXT_SUBTITLE_OUTLINE_COLOUR;
-};
+class Job;
 
 /** @class TextSubtitleContent
  *  @brief SubRip or SSA subtitles.
  */
-class TextSubtitleContent : public SubtitleContent
+class TextSubtitleContent : public Content
 {
 public:
 	TextSubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -40,54 +35,12 @@ public:
 		return boost::dynamic_pointer_cast<TextSubtitleContent> (Content::shared_from_this ());
 	}
 
-	/* Content */
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *) const;
+	void as_xml (xmlpp::Node *, bool with_paths) const;
 	DCPTime full_length () const;
 
-	/* SubtitleContent */
-
-	bool has_text_subtitles () const {
-		return true;
-	}
-
-	bool has_image_subtitles () const {
-		return false;
-	}
-
-	double subtitle_video_frame_rate () const;
-	void set_subtitle_video_frame_rate (int r);
-
-	void set_colour (dcp::Colour);
-
-	dcp::Colour colour () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _colour;
-	}
-
-	void set_outline (bool);
-
-	bool outline () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _outline;
-	}
-
-	void set_outline_colour (dcp::Colour);
-
-	dcp::Colour outline_colour () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _outline_colour;
-	}
-
-	static std::string const font_id;
-
 private:
 	ContentTime _length;
-	/** Video frame rate that this content has been prepared for, if known */
-	boost::optional<double> _frame_rate;
-	dcp::Colour _colour;
-	bool _outline;
-	dcp::Colour _outline_colour;
 };