diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 21:48:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 9cb73fbc0fa4643612f01665bc6d9fc430656f32 (patch) | |
| tree | 2b13822810da4118e4af6810c78c2f78d90099b8 /src/wx | |
| parent | b9dc4932eba9e84f50abe62d8cd779b8b436f3a4 (diff) | |
Reword again: Text -> Caption and Plain -> Text.
sed -i "s/ActiveText/ActiveCaptions/g" src/lib/*.{cc,h}
sed -i "s/active_text.h/active_captions.h/g" src/lib/*.{cc,h}
sed -i "s/active_text.cc/active_captions.cc/g" src/lib/wscript
mv src/lib/active_text.cc src/lib/active_captions.cc
mv src/lib/active_text.h src/lib/active_captions.h
sed -i "s/PlainTextFileContent/TextCaptionFileContent/g" src/lib/*.{cc,h} src/wx/*.cc
sed -i "s/PlainTextFile/TextCaptionFile/g" src/lib/*.{cc,h} src/wx/*.cc
sed -i "s/plain_text_file_content/text_caption_file_content/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h} test/*.cc
mv src/lib/plain_text_file_content.cc src/lib/text_caption_file_content.cc
mv src/lib/plain_text_file_content.h src/lib/text_caption_file_content.h
sed -i "s/PlainTextFileDecoder/TextCaptionFileDecoder/g" src/lib/*.{cc,h}
sed -i "s/plain_text_file_decoder/text_caption_file_decoder/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h}
mv src/lib/plain_text_file_decoder.cc src/lib/text_caption_file_decoder.cc
mv src/lib/plain_text_file_decoder.h src/lib/text_caption_file_decoder.h
sed -i "s/PlayerText/PlayerCaption/g" src/lib/*.{cc,h}
sed -i "s/player_text.cc/player_caption.cc/g" src/lib/wscript
sed -i "s/player_text.h/player_caption.h/g" src/lib/*.{cc,h}
mv src/lib/player_text.cc src/lib/player_caption.cc
mv src/lib/player_text.h src/lib/player_caption.h
sed -i "s/ContentPlainText/ContentTextCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h}
sed -i "s/ContentBitmapText/ContentBitmapCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h}
sed -i "s/PlainText/TextCaption/g" src/lib/*.{cc,h} test/*.cc
sed -i "s/plain_text.h/text_caption.h/g" src/lib/*.{cc,h}
mv src/lib/plain_text.h src/lib/text_caption.h
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/caption_panel.cc | 6 | ||||
| -rw-r--r-- | src/wx/content_panel.cc | 6 | ||||
| -rw-r--r-- | src/wx/subtitle_appearance_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/subtitle_view.cc | 6 | ||||
| -rw-r--r-- | src/wx/subtitle_view.h | 2 | ||||
| -rw-r--r-- | src/wx/timing_panel.cc | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/wx/caption_panel.cc b/src/wx/caption_panel.cc index c4a71677b..20a0ad143 100644 --- a/src/wx/caption_panel.cc +++ b/src/wx/caption_panel.cc @@ -26,10 +26,10 @@ #include "fonts_dialog.h" #include "subtitle_appearance_dialog.h" #include "lib/ffmpeg_content.h" -#include "lib/plain_text_file_content.h" +#include "lib/text_caption_file_content.h" #include "lib/ffmpeg_subtitle_stream.h" #include "lib/dcp_text_content.h" -#include "lib/plain_text_file_decoder.h" +#include "lib/text_caption_file_decoder.h" #include "lib/dcp_text_decoder.h" #include "lib/dcp_content.h" #include "lib/text_content.h" @@ -303,7 +303,7 @@ CaptionPanel::setup_sensitivity () BOOST_FOREACH (shared_ptr<Content> i, sel) { /* These are the content types that could include subtitles */ shared_ptr<const FFmpegContent> fc = boost::dynamic_pointer_cast<const FFmpegContent> (i); - shared_ptr<const PlainTextFileContent> sc = boost::dynamic_pointer_cast<const PlainTextFileContent> (i); + shared_ptr<const TextCaptionFileContent> sc = boost::dynamic_pointer_cast<const TextCaptionFileContent> (i); shared_ptr<const DCPContent> dc = boost::dynamic_pointer_cast<const DCPContent> (i); shared_ptr<const DCPTextContent> dsc = boost::dynamic_pointer_cast<const DCPTextContent> (i); if (fc) { diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 770015292..3dc0e2b63 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -39,7 +39,7 @@ #include "lib/config.h" #include "lib/log.h" #include "lib/compose.hpp" -#include "lib/plain_text_file_content.h" +#include "lib/text_caption_file_content.h" #include "lib/plain_text_file.h" #include <wx/wx.h> #include <wx/notebook.h> @@ -258,11 +258,11 @@ ContentPanel::selection_changed () BOOST_FOREACH (shared_ptr<Content> i, selected ()) { DCPTime p; p = i->position(); - if (dynamic_pointer_cast<PlainTextFileContent>(i) && i->paths_valid()) { + if (dynamic_pointer_cast<TextCaptionFileContent>(i) && i->paths_valid()) { /* Rather special case; if we select a text subtitle file jump to its first subtitle. */ - PlainTextFile ts (dynamic_pointer_cast<PlainTextFileContent>(i)); + TextCaptionFile ts (dynamic_pointer_cast<TextCaptionFileContent>(i)); if (ts.first()) { p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position())); } diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index 77109909f..de6f1c8e8 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -20,7 +20,7 @@ #include "subtitle_appearance_dialog.h" #include "rgba_colour_picker.h" -#include "lib/plain_text_file_content.h" +#include "lib/text_caption_file_content.h" #include "lib/text_content.h" #include "lib/ffmpeg_subtitle_stream.h" #include "lib/ffmpeg_content.h" diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc index b2e74eb88..f33d6eddf 100644 --- a/src/wx/subtitle_view.cc +++ b/src/wx/subtitle_view.cc @@ -18,13 +18,13 @@ */ -#include "lib/plain_text_file_decoder.h" +#include "lib/text_caption_file_decoder.h" #include "lib/content_text.h" #include "lib/video_decoder.h" #include "lib/audio_decoder.h" #include "lib/film.h" #include "lib/config.h" -#include "lib/plain_text_file_content.h" +#include "lib/text_caption_file_content.h" #include "lib/text_decoder.h" #include "subtitle_view.h" #include "film_viewer.h" @@ -92,7 +92,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr< } void -SubtitleView::data_start (ContentPlainText cts) +SubtitleView::data_start (ContentTextCaption cts) { BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) { wxListItem list_item; diff --git a/src/wx/subtitle_view.h b/src/wx/subtitle_view.h index 7272c608c..222fc3890 100644 --- a/src/wx/subtitle_view.h +++ b/src/wx/subtitle_view.h @@ -32,7 +32,7 @@ public: SubtitleView (wxWindow *, boost::shared_ptr<Film>, boost::shared_ptr<Content> content, boost::shared_ptr<Decoder>, FilmViewer* viewer); private: - void data_start (ContentPlainText cts); + void data_start (ContentTextCaption cts); void data_stop (ContentTime time); void subtitle_selected (wxListEvent &); diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 93ac02784..2a97f405f 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -29,7 +29,7 @@ #include "lib/text_content.h" #include "lib/dcp_text_content.h" #include "lib/audio_content.h" -#include "lib/plain_text_file_content.h" +#include "lib/text_caption_file_content.h" #include "lib/video_content.h" #include <dcp/locale_convert.h> #include <boost/foreach.hpp> |
