X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;fp=src%2Flib%2Fsubtitle_content.cc;h=5b370847ba08d2f2f156301f5864982f7820efae;hp=3702eef4152c484ee3b044804ebdc86aabdaae91;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hpb=4265db19ba68a995fca42bdd5fa815aead9c5c50

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 3702eef41..5b370847b 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -18,26 +18,41 @@
 */
 
 #include <libcxml/cxml.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "subtitle_content.h"
 #include "util.h"
 #include "exceptions.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::vector;
+using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
 int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
 int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
 int const SubtitleContentProperty::SUBTITLE_X_SCALE = 502;
 int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503;
+int const SubtitleContentProperty::USE_SUBTITLES = 504;
+
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
+	: Content (f)
+	, _use_subtitles (false)
+	, _subtitle_x_offset (0)
+	, _subtitle_y_offset (0)
+	, _subtitle_x_scale (1)
+	, _subtitle_y_scale (1)
+{
+
+}
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
+	, _use_subtitles (false)
 	, _subtitle_x_offset (0)
 	, _subtitle_y_offset (0)
 	, _subtitle_x_scale (1)
@@ -46,13 +61,20 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::p
 
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
 	: Content (f, node)
+	, _use_subtitles (false)
 	, _subtitle_x_offset (0)
 	, _subtitle_y_offset (0)
 	, _subtitle_x_scale (1)
 	, _subtitle_y_scale (1)
 {
+	if (version >= 32) {
+		_use_subtitles = node->bool_child ("UseSubtitles");
+	} else {
+		_use_subtitles = false;
+	}
+	
 	if (version >= 7) {
 		_subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
 		_subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
@@ -77,6 +99,10 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
 	for (size_t i = 0; i < c.size(); ++i) {
 		shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
 
+		if (sc->use_subtitles() != ref->use_subtitles()) {
+			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."));
 		}
@@ -94,6 +120,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
 		}
 	}
 
+	_use_subtitles = ref->use_subtitles ();
 	_subtitle_x_offset = ref->subtitle_x_offset ();
 	_subtitle_y_offset = ref->subtitle_y_offset ();
 	_subtitle_x_scale = ref->subtitle_x_scale ();
@@ -103,12 +130,23 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
 void
 SubtitleContent::as_xml (xmlpp::Node* root) const
 {
+	root->add_child("UseSubtitles")->add_child_text (raw_convert<string> (_use_subtitles));
 	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("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
 	root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
 }
 
+void
+SubtitleContent::set_use_subtitles (bool u)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_use_subtitles = u;
+	}
+	signal_changed (SubtitleContentProperty::USE_SUBTITLES);
+}
+	
 void
 SubtitleContent::set_subtitle_x_offset (double o)
 {
@@ -148,3 +186,16 @@ SubtitleContent::set_subtitle_y_scale (double s)
 	}
 	signal_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE);
 }
+
+string
+SubtitleContent::identifier () const
+{
+	SafeStringStream s;
+	s << Content::identifier()
+	  << "_" << raw_convert<string> (subtitle_x_scale())
+	  << "_" << raw_convert<string> (subtitle_y_scale())
+	  << "_" << raw_convert<string> (subtitle_x_offset())
+	  << "_" << raw_convert<string> (subtitle_y_offset());
+
+	return s.str ();
+}