More renaming.

sed -i "s/emit_text/emit_plain/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_image_start/emit_bitmap_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_text_start/emit_plain_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/render_subtitles/render_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript test/*.cc
sed -i "s/ImageStart/BitmapStart/g" src/lib/*.cc src/lib/*.h
sed -i "s/TextStart/PlainStart/g" src/lib/*.cc src/lib/*.h test/*.cc src/wx/*.cc
sed -i "s/ImageSubtitle/BitmapText/g" src/lib/*.cc src/lib/*.h
sed -i "s/text_subtitle/plain_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript src/wx/*.cc src/wx/*.h test/*.cc
sed -i "s/image_subtitle/bitmap_text/g" src/lib/*.cc src/lib/*.h
mv src/lib/render_subtitles.cc src/lib/render_text.cc
mv src/lib/render_subtitles.h src/lib/render_text.h
mv src/lib/text_subtitle.cc src/lib/plain_text.cc
mv src/lib/text_subtitle.h src/lib/plain_text.h

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index f834fe197..5a3e8157c 100644
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -23,7 +23,7 @@
 
 #include "dcpomatic_time.h"
 #include "rect.h"
-#include "image_subtitle.h"
+#include "bitmap_text.h"
 #include <dcp/subtitle_string.h>
 #include <list>
 
@@ -44,16 +44,16 @@ private:
 	ContentTime _from;
 };
 
-class ContentImageSubtitle : public ContentSubtitle
+class ContentBitmapText : public ContentSubtitle
 {
 public:
-	ContentImageSubtitle (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+	ContentBitmapText (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
 		: ContentSubtitle (f)
 		, sub (im, r)
 	{}
 
 	/* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */
-	ImageSubtitle sub;
+	BitmapText sub;
 };
 
 /** A text subtitle.  We store the time period separately (as well as in the dcp::SubtitleStrings)