Clean up after previous commit.

1 files changed, 22 insertions, 22 deletions

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index de6f1c8e8..c0a6a0df6 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -21,7 +21,7 @@
 #include "subtitle_appearance_dialog.h"
 #include "rgba_colour_picker.h"
 #include "lib/text_caption_file_content.h"
-#include "lib/text_content.h"
+#include "lib/caption_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
 #include "lib/ffmpeg_content.h"
 #include <wx/wx.h>
@@ -126,7 +126,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 	_effect->Append (_("Outline"));
 	_effect->Append (_("Shadow"));;
 
-	optional<dcp::Colour> colour = _content->subtitle->colour();
+	optional<dcp::Colour> colour = _content->caption->colour();
 	_force_colour->SetValue (static_cast<bool>(colour));
 	if (colour) {
 		_colour->SetColour (wxColour (colour->r, colour->g, colour->b));
@@ -134,7 +134,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_colour->SetColour (wxColour (255, 255, 255));
 	}
 
-	optional<dcp::Effect> effect = _content->subtitle->effect();
+	optional<dcp::Effect> effect = _content->caption->effect();
 	_force_effect->SetValue (static_cast<bool>(effect));
 	if (effect) {
 		switch (*effect) {
@@ -152,7 +152,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_effect->SetSelection (NONE);
 	}
 
-	optional<dcp::Colour> effect_colour = _content->subtitle->effect_colour();
+	optional<dcp::Colour> effect_colour = _content->caption->effect_colour();
 	_force_effect_colour->SetValue (static_cast<bool>(effect_colour));
 	if (effect_colour) {
 		_effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b));
@@ -160,7 +160,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_effect_colour->SetColour (wxColour (0, 0, 0));
 	}
 
-	optional<ContentTime> fade_in = _content->subtitle->fade_in();
+	optional<ContentTime> fade_in = _content->caption->fade_in();
 	_force_fade_in->SetValue (static_cast<bool>(fade_in));
 	if (fade_in) {
 		_fade_in->set (*fade_in, _content->active_video_frame_rate());
@@ -168,7 +168,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_fade_in->set (ContentTime(), _content->active_video_frame_rate());
 	}
 
-	optional<ContentTime> fade_out = _content->subtitle->fade_out();
+	optional<ContentTime> fade_out = _content->caption->fade_out();
 	_force_fade_out->SetValue (static_cast<bool>(fade_out));
 	if (fade_out) {
 		_fade_out->set (*fade_out, _content->active_video_frame_rate ());
@@ -176,7 +176,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_fade_out->set (ContentTime(), _content->active_video_frame_rate ());
 	}
 
-	_outline_width->SetValue (_content->subtitle->outline_width ());
+	_outline_width->SetValue (_content->caption->outline_width ());
 
 	_force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
 	_force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
@@ -206,42 +206,42 @@ SubtitleAppearanceDialog::apply ()
 {
 	if (_force_colour->GetValue ()) {
 		wxColour const c = _colour->GetColour ();
-		_content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
+		_content->caption->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
 	} else {
-		_content->subtitle->unset_colour ();
+		_content->caption->unset_colour ();
 	}
 	if (_force_effect->GetValue()) {
 		switch (_effect->GetSelection()) {
 		case NONE:
-			_content->subtitle->set_effect (dcp::NONE);
+			_content->caption->set_effect (dcp::NONE);
 			break;
 		case OUTLINE:
-			_content->subtitle->set_effect (dcp::BORDER);
+			_content->caption->set_effect (dcp::BORDER);
 			break;
 		case SHADOW:
-			_content->subtitle->set_effect (dcp::SHADOW);
+			_content->caption->set_effect (dcp::SHADOW);
 			break;
 		}
 	} else {
-		_content->subtitle->unset_effect ();
+		_content->caption->unset_effect ();
 	}
 	if (_force_effect_colour->GetValue ()) {
 		wxColour const ec = _effect_colour->GetColour ();
-		_content->subtitle->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
+		_content->caption->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
 	} else {
-		_content->subtitle->unset_effect_colour ();
+		_content->caption->unset_effect_colour ();
 	}
 	if (_force_fade_in->GetValue ()) {
-		_content->subtitle->set_fade_in (_fade_in->get (_content->active_video_frame_rate ()));
+		_content->caption->set_fade_in (_fade_in->get (_content->active_video_frame_rate ()));
 	} else {
-		_content->subtitle->unset_fade_in ();
+		_content->caption->unset_fade_in ();
 	}
 	if (_force_fade_out->GetValue ()) {
-		_content->subtitle->set_fade_out (_fade_out->get (_content->active_video_frame_rate ()));
+		_content->caption->set_fade_out (_fade_out->get (_content->active_video_frame_rate ()));
 	} else {
-		_content->subtitle->unset_fade_out ();
+		_content->caption->unset_fade_out ();
 	}
-	_content->subtitle->set_outline_width (_outline_width->GetValue ());
+	_content->caption->set_outline_width (_outline_width->GetValue ());
 
 	if (_stream) {
 		for (map<RGBA, RGBAColourPicker*>::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) {
@@ -272,11 +272,11 @@ SubtitleAppearanceDialog::setup_sensitivity ()
 	_fade_in->Enable (_force_fade_in->GetValue ());
 	_fade_out->Enable (_force_fade_out->GetValue ());
 
-	bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->subtitle->burn ();
+	bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->caption->burn ();
 	_outline_width->Enable (can_outline_width);
 	if (can_outline_width) {
 		_outline_width->UnsetToolTip ();
 	} else {
-		_outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in subtitles"));
+		_outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in captions"));
 	}
 }