X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=8c94a94b995f7f35798dc3ec06f1a02a090890a4;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hp=9fefbbfcda7258c5ff66ec01d80658bf46761bfd;hpb=b655bd3359e9a014da68cd9f61e2a5b1d233247d;p=dcpomatic.git

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 9fefbbfcd..8c94a94b9 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -18,47 +18,133 @@
 */
 
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "subtitle_content.h"
+#include "util.h"
+#include "exceptions.h"
+
+#include "i18n.h"
 
 using std::string;
+using std::stringstream;
+using std::vector;
+using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
+
+int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
+int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
+int const SubtitleContentProperty::SUBTITLE_SCALE = 502;
+int const SubtitleContentProperty::SUBTITLE_USE = 503;
+
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
+	: Content (f)
+	, _subtitle_use (false)
+	, _subtitle_x_offset (0)
+	, _subtitle_y_offset (0)
+	, _subtitle_scale (1)
+{
 
-int const SubtitleContentProperty::SUBTITLE_OFFSET = 500;
-int const SubtitleContentProperty::SUBTITLE_SCALE = 501;
+}
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
-	, _subtitle_offset (0)
+	, _subtitle_use (false)
+	, _subtitle_x_offset (0)
+	, _subtitle_y_offset (0)
 	, _subtitle_scale (1)
 {
 
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
 	: Content (f, node)
-	, _subtitle_offset (0)
+	, _subtitle_use (false)
+	, _subtitle_x_offset (0)
+	, _subtitle_y_offset (0)
 	, _subtitle_scale (1)
 {
-	_subtitle_offset = node->number_child<float> ("SubtitleOffset");
+	if (version >= 7) {
+		_subtitle_use = node->bool_child ("SubtitleUse");
+		_subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
+		_subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
+	} else {
+		_subtitle_y_offset = node->number_child<float> ("SubtitleOffset");
+	}
+	
 	_subtitle_scale = node->number_child<float> ("SubtitleScale");
 }
 
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
+	: Content (f, c)
+{
+	shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
+	assert (ref);
+	
+	for (size_t i = 0; i < c.size(); ++i) {
+		shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
+
+		if (sc->subtitle_use() != ref->subtitle_use()) {
+			throw JoinError (_("Content to be joined must have the same 'use subtitles' setting."));
+		}
+
+		if (sc->subtitle_x_offset() != ref->subtitle_x_offset()) {
+			throw JoinError (_("Content to be joined must have the same subtitle X offset."));
+		}
+		
+		if (sc->subtitle_y_offset() != ref->subtitle_y_offset()) {
+			throw JoinError (_("Content to be joined must have the same subtitle Y offset."));
+		}
+
+		if (sc->subtitle_scale() != ref->subtitle_scale()) {
+			throw JoinError (_("Content to be joined must have the same subtitle scale."));
+		}
+	}
+
+	_subtitle_use = ref->subtitle_use ();
+	_subtitle_x_offset = ref->subtitle_x_offset ();
+	_subtitle_y_offset = ref->subtitle_y_offset ();
+	_subtitle_scale = ref->subtitle_scale ();
+}
+
 void
 SubtitleContent::as_xml (xmlpp::Node* root) const
 {
-	root->add_child("SubtitleOffset")->add_child_text (lexical_cast<string> (_subtitle_offset));
-	root->add_child("SubtitleScale")->add_child_text (lexical_cast<string> (_subtitle_scale));
+	root->add_child("SubtitleUse")->add_child_text (raw_convert<string> (_subtitle_use));
+	root->add_child("SubtitleXOffset")->add_child_text (raw_convert<string> (_subtitle_x_offset));
+	root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
+	root->add_child("SubtitleScale")->add_child_text (raw_convert<string> (_subtitle_scale));
+}
+
+void
+SubtitleContent::set_subtitle_use (bool u)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_subtitle_use = u;
+	}
+	signal_changed (SubtitleContentProperty::SUBTITLE_USE);
+}
+	
+void
+SubtitleContent::set_subtitle_x_offset (double o)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_subtitle_x_offset = o;
+	}
+	signal_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
 }
 
 void
-SubtitleContent::set_subtitle_offset (double o)
+SubtitleContent::set_subtitle_y_offset (double o)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_subtitle_offset = o;
+		_subtitle_y_offset = o;
 	}
-	signal_changed (SubtitleContentProperty::SUBTITLE_OFFSET);
+	signal_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
 }
 
 void
@@ -70,3 +156,15 @@ SubtitleContent::set_subtitle_scale (double s)
 	}
 	signal_changed (SubtitleContentProperty::SUBTITLE_SCALE);
 }
+
+string
+SubtitleContent::identifier () const
+{
+	stringstream s;
+	s << Content::identifier()
+	  << "_" << raw_convert<string> (subtitle_scale())
+	  << "_" << raw_convert<string> (subtitle_x_offset())
+	  << "_" << raw_convert<string> (subtitle_y_offset());
+
+	return s.str ();
+}