Rename SubRip -> TextSubtitle.

5 files changed, 22 insertions, 22 deletions

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 0db55edfe..8e158bbac 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -18,13 +18,13 @@
 */
 
 #include "subtitle_appearance_dialog.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include <wx/wx.h>
 #include <wx/clrpicker.h>
 
 using boost::shared_ptr;
 
-SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr<SubRipContent> content)
+SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr<TextSubtitleContent> content)
 	: TableDialog (parent, _("Subtitle appearance"), 2, 1, true)
 	, _content (content)
 {
diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index f4fe307d2..fddb902ac 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -22,12 +22,12 @@
 
 class wxCheckBox;
 class wxColourPickerCtrl;
-class SubRipContent;
+class TextSubtitleContent;
 
 class SubtitleAppearanceDialog : public TableDialog
 {
 public:
-	SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<SubRipContent> content);
+	SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<TextSubtitleContent> content);
 
 	void apply ();
 
@@ -36,5 +36,5 @@ private:
 	wxCheckBox* _outline;
 	wxColourPickerCtrl* _outline_colour;
 
-	boost::shared_ptr<SubRipContent> _content;
+	boost::shared_ptr<TextSubtitleContent> _content;
 };
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 591166a9e..3024617e5 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -25,10 +25,10 @@
 #include "fonts_dialog.h"
 #include "subtitle_appearance_dialog.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
 #include "lib/dcp_subtitle_content.h"
-#include "lib/subrip_decoder.h"
+#include "lib/text_subtitle_decoder.h"
 #include "lib/dcp_subtitle_decoder.h"
 #include "lib/dcp_content.h"
 #include <wx/spinctrl.h>
@@ -233,13 +233,13 @@ SubtitlePanel::setup_sensitivity ()
 {
 	int any_subs = 0;
 	int ffmpeg_subs = 0;
-	int subrip_subs = 0;
+	int text_subs = 0;
 	int dcp_subs = 0;
 	int image_subs = 0;
 	SubtitleContentList sel = _parent->selected_subtitle ();
 	BOOST_FOREACH (shared_ptr<SubtitleContent> i, sel) {
 		shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (i);
-		shared_ptr<const SubRipContent> sc = boost::dynamic_pointer_cast<const SubRipContent> (i);
+		shared_ptr<const TextSubtitleContent> sc = boost::dynamic_pointer_cast<const TextSubtitleContent> (i);
 		shared_ptr<const DCPSubtitleContent> dsc = boost::dynamic_pointer_cast<const DCPSubtitleContent> (i);
 		if (fc) {
 			if (fc->has_subtitles ()) {
@@ -247,7 +247,7 @@ SubtitlePanel::setup_sensitivity ()
 				++any_subs;
 			}
 		} else if (sc) {
-			++subrip_subs;
+			++text_subs;
 			++any_subs;
 		} else if (dsc) {
 			++dcp_subs;
@@ -283,9 +283,9 @@ SubtitlePanel::setup_sensitivity ()
 	_y_scale->Enable (!reference && any_subs > 0 && use);
 	_language->Enable (!reference && any_subs > 0 && use);
 	_stream->Enable (!reference && ffmpeg_subs == 1);
-	_subtitle_view_button->Enable (!reference && (subrip_subs == 1 || dcp_subs == 1));
-	_fonts_dialog_button->Enable (!reference && (subrip_subs == 1 || dcp_subs == 1));
-	_appearance_dialog_button->Enable (!reference && subrip_subs == 1);
+	_subtitle_view_button->Enable (!reference && (text_subs == 1 || dcp_subs == 1));
+	_fonts_dialog_button->Enable (!reference && (text_subs == 1 || dcp_subs == 1));
+	_appearance_dialog_button->Enable (!reference && text_subs == 1);
 }
 
 void
@@ -379,9 +379,9 @@ SubtitlePanel::subtitle_view_clicked ()
 
 	shared_ptr<SubtitleDecoder> decoder;
 
-	shared_ptr<SubRipContent> sr = dynamic_pointer_cast<SubRipContent> (c.front ());
+	shared_ptr<TextSubtitleContent> sr = dynamic_pointer_cast<TextSubtitleContent> (c.front ());
 	if (sr) {
-		decoder.reset (new SubRipDecoder (sr));
+		decoder.reset (new TextSubtitleDecoder (sr));
 	}
 
 	shared_ptr<DCPSubtitleContent> dc = dynamic_pointer_cast<DCPSubtitleContent> (c.front ());
@@ -432,7 +432,7 @@ SubtitlePanel::appearance_dialog_clicked ()
 	SubtitleContentList c = _parent->selected_subtitle ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	shared_ptr<SubRipContent> sr = dynamic_pointer_cast<SubRipContent> (c.front ());
+	shared_ptr<TextSubtitleContent> sr = dynamic_pointer_cast<TextSubtitleContent> (c.front ());
 	DCPOMATIC_ASSERT (sr);
 
 	SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, sr);
diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index f54b19680..916f1eedc 100644
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -17,10 +17,10 @@
 
 */
 
-#include "lib/subrip_decoder.h"
+#include "lib/text_subtitle_decoder.h"
 #include "lib/content_subtitle.h"
 #include "lib/film.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "subtitle_view.h"
 #include "wx_util.h"
 
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index c7567455b..a29240f8d 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -27,7 +27,7 @@
 #include "lib/raw_convert.h"
 #include "lib/subtitle_content.h"
 #include "lib/dcp_subtitle_content.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include <boost/foreach.hpp>
 #include <set>
 #include <iostream>
@@ -393,13 +393,13 @@ TimingPanel::set_video_frame_rate ()
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (i);
 		shared_ptr<DCPSubtitleContent> dsc = dynamic_pointer_cast<DCPSubtitleContent> (i);
-		shared_ptr<SubRipContent> ssc = dynamic_pointer_cast<SubRipContent> (i);
+		shared_ptr<TextSubtitleContent> tsc = dynamic_pointer_cast<TextSubtitleContent> (i);
 		if (vc) {
 			vc->set_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
 		} else if (dsc) {
 			dsc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
-		} else if (ssc) {
-			ssc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
+		} else if (tsc) {
+			tsc->set_subtitle_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
 		}
 		_set_video_frame_rate->Enable (false);
 	}