Rename subtitle_use -> use_subtitles.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 8c94a94b9..3415ae613 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -36,11 +36,11 @@ 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;
+int const SubtitleContentProperty::USE_SUBTITLES = 503;
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
 	: Content (f)
-	, _subtitle_use (false)
+	, _use_subtitles (false)
 	, _subtitle_x_offset (0)
 	, _subtitle_y_offset (0)
 	, _subtitle_scale (1)
@@ -50,7 +50,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
-	, _subtitle_use (false)
+	, _use_subtitles (false)
 	, _subtitle_x_offset (0)
 	, _subtitle_y_offset (0)
 	, _subtitle_scale (1)
@@ -60,13 +60,13 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::p
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
 	: Content (f, node)
-	, _subtitle_use (false)
+	, _use_subtitles (false)
 	, _subtitle_x_offset (0)
 	, _subtitle_y_offset (0)
 	, _subtitle_scale (1)
 {
 	if (version >= 7) {
-		_subtitle_use = node->bool_child ("SubtitleUse");
+		_use_subtitles = node->bool_child ("UseSubtitles");
 		_subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
 		_subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
 	} else {
@@ -85,7 +85,7 @@ 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->subtitle_use() != ref->subtitle_use()) {
+		if (sc->use_subtitles() != ref->use_subtitles()) {
 			throw JoinError (_("Content to be joined must have the same 'use subtitles' setting."));
 		}
 
@@ -102,7 +102,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
 		}
 	}
 
-	_subtitle_use = ref->subtitle_use ();
+	_use_subtitles = ref->use_subtitles ();
 	_subtitle_x_offset = ref->subtitle_x_offset ();
 	_subtitle_y_offset = ref->subtitle_y_offset ();
 	_subtitle_scale = ref->subtitle_scale ();
@@ -111,20 +111,20 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
 void
 SubtitleContent::as_xml (xmlpp::Node* root) const
 {
-	root->add_child("SubtitleUse")->add_child_text (raw_convert<string> (_subtitle_use));
+	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("SubtitleScale")->add_child_text (raw_convert<string> (_subtitle_scale));
 }
 
 void
-SubtitleContent::set_subtitle_use (bool u)
+SubtitleContent::set_use_subtitles (bool u)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_subtitle_use = u;
+		_use_subtitles = u;
 	}
-	signal_changed (SubtitleContentProperty::SUBTITLE_USE);
+	signal_changed (SubtitleContentProperty::USE_SUBTITLES);
 }
 	
 void