Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.

16 files changed, 47 insertions, 47 deletions

diff --git a/src/lib/active_subtitles.cc b/src/lib/active_subtitles.cc
index f1d201798..f309ba1e0 100644
--- a/src/lib/active_subtitles.cc
+++ b/src/lib/active_subtitles.cc
@@ -35,10 +35,10 @@ using boost::optional;
  *  @param period Period of interest.
  *  @param always_burn_subtitles Always burn subtitles even if their content is not set to burn.
  */
-list<PlayerSubtitles>
+list<PlayerText>
 ActiveSubtitles::get_burnt (DCPTimePeriod period, bool always_burn_subtitles) const
 {
-	list<PlayerSubtitles> ps;
+	list<PlayerText> ps;
 
 	for (Map::const_iterator i = _data.begin(); i != _data.end(); ++i) {
 
@@ -91,7 +91,7 @@ ActiveSubtitles::clear_before (DCPTime time)
  *  @param from From time for these subtitles.
  */
 void
-ActiveSubtitles::add_from (weak_ptr<Piece> piece, PlayerSubtitles ps, DCPTime from)
+ActiveSubtitles::add_from (weak_ptr<Piece> piece, PlayerText ps, DCPTime from)
 {
 	if (_data.find(piece) == _data.end()) {
 		_data[piece] = list<Period>();
@@ -104,14 +104,14 @@ ActiveSubtitles::add_from (weak_ptr<Piece> piece, PlayerSubtitles ps, DCPTime fr
  *  @param to To time for the last subtitle submitted to add_from for this piece.
  *  @return Return the corresponding subtitles and their from time.
  */
-pair<PlayerSubtitles, DCPTime>
+pair<PlayerText, DCPTime>
 ActiveSubtitles::add_to (weak_ptr<Piece> piece, DCPTime to)
 {
 	DCPOMATIC_ASSERT (_data.find(piece) != _data.end());
 
 	_data[piece].back().to = to;
 
-	BOOST_FOREACH (SubtitleString& i, _data[piece].back().subs.text) {
+	BOOST_FOREACH (PlainText& i, _data[piece].back().subs.text) {
 		i.set_out (dcp::Time(to.seconds(), 1000));
 	}
 
diff --git a/src/lib/active_subtitles.h b/src/lib/active_subtitles.h
index 1496bc5d2..2dd0a4b16 100644
--- a/src/lib/active_subtitles.h
+++ b/src/lib/active_subtitles.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,7 +23,7 @@
  */
 
 #include "dcpomatic_time.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include <boost/noncopyable.hpp>
 #include <list>
 #include <map>
@@ -36,11 +36,11 @@ class Piece;
 class ActiveSubtitles : public boost::noncopyable
 {
 public:
-	std::list<PlayerSubtitles> get_burnt (DCPTimePeriod period, bool always_burn_subtitles) const;
+	std::list<PlayerText> get_burnt (DCPTimePeriod period, bool always_burn_subtitles) const;
 	void clear_before (DCPTime time);
 	void clear ();
-	void add_from (boost::weak_ptr<Piece> piece, PlayerSubtitles ps, DCPTime from);
-	std::pair<PlayerSubtitles, DCPTime> add_to (boost::weak_ptr<Piece> piece, DCPTime to);
+	void add_from (boost::weak_ptr<Piece> piece, PlayerText ps, DCPTime from);
+	std::pair<PlayerText, DCPTime> add_to (boost::weak_ptr<Piece> piece, DCPTime to);
 	bool have (boost::weak_ptr<Piece> piece) const;
 
 private:
@@ -49,12 +49,12 @@ private:
 	public:
 		Period () {}
 
-		Period (PlayerSubtitles s, DCPTime f)
+		Period (PlayerText s, DCPTime f)
 			: subs (s)
 			, from (f)
 		{}
 
-		PlayerSubtitles subs;
+		PlayerText subs;
 		DCPTime from;
 		boost::optional<DCPTime> to;
 	};
diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 9121e9d53..c38d73276 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -141,7 +141,7 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
+DCPEncoder::subtitle (PlayerText data, DCPTimePeriod period)
 {
 	if (_non_burnt_subtitles) {
 		_writer->write (data, period);
diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 15f3dbc64..7fbb076f3 100644
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,7 +19,7 @@
 */
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "encoder.h"
 #include <boost/weak_ptr.hpp>
 
@@ -52,7 +52,7 @@ private:
 
 	void video (boost::shared_ptr<PlayerVideo>, DCPTime);
 	void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-	void subtitle (PlayerSubtitles, DCPTimePeriod);
+	void subtitle (PlayerText, DCPTimePeriod);
 
 	boost::shared_ptr<Writer> _writer;
 	boost::shared_ptr<J2KEncoder> _j2k_encoder;
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 4907ed7c5..f4116c50c 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -22,7 +22,7 @@
 #define DCPOMATIC_ENCODER_H
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index e55622abf..e9d872c8f 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -411,7 +411,7 @@ FFmpegEncoder::audio_frame (int size)
 }
 
 void
-FFmpegEncoder::subtitle (PlayerSubtitles, DCPTimePeriod)
+FFmpegEncoder::subtitle (PlayerText, DCPTimePeriod)
 {
 
 }
diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index ca1aa6fbc..b1d07eb7f 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -54,7 +54,7 @@ public:
 private:
 	void video (boost::shared_ptr<PlayerVideo>, DCPTime);
 	void audio (boost::shared_ptr<AudioBuffers>);
-	void subtitle (PlayerSubtitles, DCPTimePeriod);
+	void subtitle (PlayerText, DCPTimePeriod);
 
 	void setup_video ();
 	void setup_audio ();
diff --git a/src/lib/subtitle_string.h b/src/lib/plain_text.h
index 81ebc2744..05a95aef2 100644
--- a/src/lib/subtitle_string.h
+++ b/src/lib/plain_text.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef DCPOMATIC_SUBTITLE_STRING_H
-#define DCPOMATIC_SUBTITLE_STRING_H
+#ifndef DCPOMATIC_PLAIN_TEXT_H
+#define DCPOMATIC_PLAIN_TEXT_H
 
 #include <dcp/subtitle_string.h>
 
@@ -27,15 +27,15 @@
  *  applicable to true DCP subtitles.  For example, we can set outline width for burn-in
  *  but this cannot be specified in DCP XML.
  */
-class SubtitleString : public dcp::SubtitleString
+class PlainText : public dcp::SubtitleString
 {
 public:
-	explicit SubtitleString (dcp::SubtitleString dcp_)
+	explicit PlainText (dcp::SubtitleString dcp_)
 		: dcp::SubtitleString (dcp_)
 		, outline_width (2)
 	{}
 
-	SubtitleString (dcp::SubtitleString dcp_, int outline_width_)
+	PlainText (dcp::SubtitleString dcp_, int outline_width_)
 		: dcp::SubtitleString (dcp_)
 		, outline_width (outline_width_)
 	{}
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 4c9e216e1..32c2dfdfd 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -663,7 +663,7 @@ Player::subtitles_for_frame (DCPTime time) const
 
 	int const vfr = _film->video_frame_rate();
 
-	BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) {
+	BOOST_FOREACH (PlayerText i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) {
 
 		/* Image subtitles */
 		list<PositionImage> c = transform_bitmap_texts (i.image);
@@ -858,7 +858,7 @@ Player::bitmap_text_start (weak_ptr<Piece> wp, ContentBitmapText subtitle)
 	subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale ();
 	subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale ();
 
-	PlayerSubtitles ps;
+	PlayerText ps;
 	ps.image.push_back (subtitle.sub);
 	DCPTime from (content_time_to_dcp (piece, subtitle.from()));
 
@@ -873,7 +873,7 @@ Player::plain_text_start (weak_ptr<Piece> wp, ContentPlainText subtitle)
 		return;
 	}
 
-	PlayerSubtitles ps;
+	PlayerText ps;
 	DCPTime const from (content_time_to_dcp (piece, subtitle.from()));
 
 	if (from > piece->content->end()) {
@@ -926,7 +926,7 @@ Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 		return;
 	}
 
-	pair<PlayerSubtitles, DCPTime> from = _active_subtitles.add_to (wp, dcp_to);
+	pair<PlayerText, DCPTime> from = _active_subtitles.add_to (wp, dcp_to);
 
 	if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {
 		Subtitle (from.first, DCPTimePeriod (from.second, dcp_to));
diff --git a/src/lib/player.h b/src/lib/player.h
index abc06721a..2f1baa53c 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -21,7 +21,7 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "active_subtitles.h"
 #include "content_text.h"
 #include "film.h"
@@ -101,7 +101,7 @@ public:
 	/** Emitted when a subtitle is ready.  This signal may be emitted considerably
 	 *  after the corresponding Video.
 	 */
-	boost::signals2::signal<void (PlayerSubtitles, DCPTimePeriod)> Subtitle;
+	boost::signals2::signal<void (PlayerText, DCPTimePeriod)> Subtitle;
 
 private:
 	friend class PlayerWrapper;
diff --git a/src/lib/player_subtitles.cc b/src/lib/player_text.cc
index 10bacde79..588e4ef7f 100644
--- a/src/lib/player_subtitles.cc
+++ b/src/lib/player_text.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,7 +18,7 @@
 
 */
 
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "font.h"
 #include <boost/foreach.hpp>
 
diff --git a/src/lib/player_subtitles.h b/src/lib/player_text.h
index 4e3a739d8..93b6cd970 100644
--- a/src/lib/player_subtitles.h
+++ b/src/lib/player_text.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,17 @@
 
 */
 
-#ifndef DCPOMATIC_PLAYER_SUBTITLES_H
-#define DCPOMATIC_PLAYER_SUBTITLES_H
+#ifndef DCPOMATIC_PLAYER_TEXT_H
+#define DCPOMATIC_PLAYER_TEXT_H
 
 #include "bitmap_text.h"
 #include "dcpomatic_time.h"
-#include "subtitle_string.h"
+#include "plain_text.h"
 
 class Font;
 
-/** A set of subtitles which span the same time period */
-class PlayerSubtitles
+/** A set of text (subtitle/CCAP) which span the same time period */
+class PlayerText
 {
 public:
 	void add_fonts (std::list<boost::shared_ptr<Font> > fonts_);
@@ -36,7 +36,7 @@ public:
 
 	/** BitmapTexts, with their rectangles transformed as specified by their content */
 	std::list<BitmapText> image;
-	std::list<SubtitleString> text;
+	std::list<PlainText> text;
 };
 
 #endif
diff --git a/src/lib/render_text.h b/src/lib/render_text.h
index 0f3a31e21..496967f31 100644
--- a/src/lib/render_text.h
+++ b/src/lib/render_text.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,7 +20,7 @@
 
 #include "position_image.h"
 #include "dcpomatic_time.h"
-#include "subtitle_string.h"
+#include "plain_text.h"
 #include <dcp/util.h>
 
 class Font;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2eec8110e..a5e8cd9d2 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -663,7 +663,7 @@ Writer::can_fake_write (Frame frame) const
 }
 
 void
-Writer::write (PlayerSubtitles subs, DCPTimePeriod period)
+Writer::write (PlayerText subs, DCPTimePeriod period)
 {
 	while (_subtitle_reel->period().to <= period.from) {
 		++_subtitle_reel;
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 0e1c0e02f..c8d188834 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,7 +23,7 @@
  */
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
 #include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -104,7 +104,7 @@ public:
 	bool can_repeat (Frame) const;
 	void repeat (Frame, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>, DCPTime time);
-	void write (PlayerSubtitles subs, DCPTimePeriod period);
+	void write (PlayerText subs, DCPTimePeriod period);
 	void write (std::list<boost::shared_ptr<Font> > fonts);
 	void write (ReferencedReelAsset asset);
 	void finish ();
diff --git a/src/lib/wscript b/src/lib/wscript
index 9e2d07d7c..ee5a583ac 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -112,7 +112,7 @@ sources = """
           mid_side_decoder.cc
           overlaps.cc
           player.cc
-          player_subtitles.cc
+          player_text.cc
           player_video.cc
           playlist.cc
           position_image.cc