Add ContentTimePeriod class.

7 files changed, 50 insertions, 50 deletions

diff --git a/src/lib/content_subtitle.cc b/src/lib/content_subtitle.cc
index 11873afee..93e0677bb 100644
--- a/src/lib/content_subtitle.cc
+++ b/src/lib/content_subtitle.cc
@@ -19,18 +19,13 @@
 
 #include "content_subtitle.h"
 
-ContentTime
-ContentTextSubtitle::from () const
+ContentTimePeriod
+ContentTextSubtitle::period () const
 {
 	/* XXX: assuming we have some subs and they are all at the same time */
 	assert (!subs.empty ());
-	return ContentTime::from_seconds (double (subs.front().in().to_ticks()) / 250);
-}
-
-ContentTime
-ContentTextSubtitle::to () const
-{
-	/* XXX: assuming we have some subs and they are all at the same time */
-	assert (!subs.empty ());
-	return ContentTime::from_seconds (double (subs.front().out().to_ticks()) / 250);
+	return ContentTimePeriod (
+		ContentTime::from_seconds (double (subs.front().in().to_ticks()) / 250),
+		ContentTime::from_seconds (double (subs.front().out().to_ticks()) / 250)
+		);
 }
diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index 8c266f483..6a28c37bf 100644
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -30,34 +30,27 @@ class Image;
 class ContentSubtitle
 {
 public:
-	virtual ContentTime from () const = 0;
-	virtual ContentTime to () const = 0;
+	virtual ContentTimePeriod period () const = 0;
 };
 
 class ContentImageSubtitle : public ContentSubtitle
 {
 public:
-	ContentImageSubtitle (ContentTime f, ContentTime t, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+	ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
 		: image (im)
 		, rectangle (r)
-		, _from (f)
-		, _to (t)
+		, _period (p)
 	{}
 
-	ContentTime from () const {
-		return _from;
+	ContentTimePeriod period () const {
+		return _period;
 	}
 
-	ContentTime to () const {
-		return _to;
-	}
-	
 	boost::shared_ptr<Image> image;
 	dcpomatic::Rect<double> rectangle;
 
 private:
-	ContentTime _from;
-	ContentTime _to;
+	ContentTimePeriod _period;
 };
 
 class ContentTextSubtitle : public ContentSubtitle
@@ -67,8 +60,7 @@ public:
 		: subs (s)
 	{}
 
-	ContentTime from () const;
-	ContentTime to () const;
+	ContentTimePeriod period () const;
 	
 	std::list<dcp::SubtitleString> subs;
 };
diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 109dc9b7f..e56f58c4b 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -146,6 +146,19 @@ public:
 
 std::ostream& operator<< (std::ostream& s, ContentTime t);
 
+class ContentTimePeriod
+{
+public:
+	ContentTimePeriod () {}
+	ContentTimePeriod (ContentTime f, ContentTime t)
+		: from (f)
+		, to (t)
+	{}
+
+	ContentTime from;
+	ContentTime to;
+};
+
 class DCPTime : public Time
 {
 public:
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 9548eaae9..eec70501a 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -535,7 +535,7 @@ FFmpegDecoder::decode_subtitle_packet ()
 	   indicate that the previous subtitle should stop.
 	*/
 	if (sub.num_rects <= 0) {
-		image_subtitle (ContentTime (), ContentTime (), shared_ptr<Image> (), dcpomatic::Rect<double> ());
+		image_subtitle (ContentTimePeriod (), shared_ptr<Image> (), dcpomatic::Rect<double> ());
 		return;
 	} else if (sub.num_rects > 1) {
 		throw DecodeError (_("multi-part subtitles not yet supported"));
@@ -545,10 +545,11 @@ FFmpegDecoder::decode_subtitle_packet ()
 	   source that we may have chopped off for the DCP)
 	*/
 	ContentTime packet_time = ContentTime::from_seconds (static_cast<double> (sub.pts) / AV_TIME_BASE) + _pts_offset;
-	
-	/* hence start time for this sub */
-	ContentTime const from = packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3);
-	ContentTime const to = packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3);
+
+	ContentTimePeriod period (
+		packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3),
+		packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3)
+		);
 
 	AVSubtitleRect const * rect = sub.rects[0];
 
@@ -586,8 +587,7 @@ FFmpegDecoder::decode_subtitle_packet ()
 	dcp::Size const vs = _ffmpeg_content->video_size ();
 
 	image_subtitle (
-		from,
-		to,
+		period,
 		image,
 		dcpomatic::Rect<double> (
 			static_cast<double> (rect->x) / vs.width,
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 4865073d7..b60dd8467 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -337,7 +337,7 @@ Player::content_to_player_video_frame (
 		ContentTime const from = dcp_to_content_subtitle (*i, time);
 		ContentTime const to = from + ContentTime::from_frames (1, content->video_frame_rate ());
 		
-		list<shared_ptr<ContentImageSubtitle> > image_subtitles = subtitle_decoder->get_image_subtitles (from, to);
+		list<shared_ptr<ContentImageSubtitle> > image_subtitles = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to));
 		if (!image_subtitles.empty ()) {
 			list<PositionImage> im = process_content_image_subtitles (
 				subtitle_content,
@@ -348,7 +348,7 @@ Player::content_to_player_video_frame (
 		}
 		
 		if (_burn_subtitles) {
-			list<shared_ptr<ContentTextSubtitle> > text_subtitles = subtitle_decoder->get_text_subtitles (from, to);
+			list<shared_ptr<ContentTextSubtitle> > text_subtitles = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to));
 			if (!text_subtitles.empty ()) {
 				list<PositionImage> im = process_content_text_subtitles (text_subtitles);
 				copy (im.begin(), im.end(), back_inserter (sub_images));
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 0f5a1992c..d114df979 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -34,9 +34,9 @@ SubtitleDecoder::SubtitleDecoder ()
  *  Image may be 0 to say that there is no current subtitle.
  */
 void
-SubtitleDecoder::image_subtitle (ContentTime from, ContentTime to, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
+SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
-	_decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (from, to, image, rect)));
+	_decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (period, image, rect)));
 }
 
 void
@@ -47,11 +47,11 @@ SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
 
 template <class T>
 list<shared_ptr<T> >
-SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime from, ContentTime to)
+SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTimePeriod period)
 {
-	if (subs.empty() || from < subs.front()->from() || to > (subs.back()->to() + ContentTime::from_seconds (10))) {
+	if (subs.empty() || period.from < subs.front()->period().from || period.to > (subs.back()->period().to + ContentTime::from_seconds (10))) {
 		/* Either we have no decoded data, or what we do have is a long way from what we want: seek */
-		seek (from, true);
+		seek (period.from, true);
 	}
 
 	/* Now enough pass() calls will either:
@@ -60,14 +60,14 @@ SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime from, Conte
 	 *
 	 *  XXX: with subs being sparse, this may need more care...
 	 */
-	while (!pass() && (subs.empty() || (subs.front()->from() > from || to < subs.back()->to()))) {}
+	while (!pass() && (subs.empty() || (subs.front()->period().from > period.from || period.to < subs.back()->period().to))) {}
 
 	/* Now look for what we wanted in the data we have collected */
 	/* XXX: inefficient */
 	
 	list<shared_ptr<T> > out;
 	for (typename list<shared_ptr<T> >::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-		if ((*i)->from() <= to && (*i)->to() >= from) {
+		if ((*i)->period().from <= period.to && (*i)->period().to >= period.from) {
 			out.push_back (*i);
 		}
 	}
@@ -76,15 +76,15 @@ SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime from, Conte
 }
 
 list<shared_ptr<ContentTextSubtitle> >
-SubtitleDecoder::get_text_subtitles (ContentTime from, ContentTime to)
+SubtitleDecoder::get_text_subtitles (ContentTimePeriod period)
 {
-	return get<ContentTextSubtitle> (_decoded_text_subtitles, from, to);
+	return get<ContentTextSubtitle> (_decoded_text_subtitles, period);
 }
 
 list<shared_ptr<ContentImageSubtitle> >
-SubtitleDecoder::get_image_subtitles (ContentTime from, ContentTime to)
+SubtitleDecoder::get_image_subtitles (ContentTimePeriod period)
 {
-	return get<ContentImageSubtitle> (_decoded_image_subtitles, from, to);
+	return get<ContentImageSubtitle> (_decoded_image_subtitles, period);
 }
 
 void
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index a26348ee6..fea4ab973 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -35,13 +35,13 @@ class SubtitleDecoder : public virtual Decoder
 public:
 	SubtitleDecoder ();
 
-	std::list<boost::shared_ptr<ContentImageSubtitle> > get_image_subtitles (ContentTime from, ContentTime to);
-	std::list<boost::shared_ptr<ContentTextSubtitle> > get_text_subtitles (ContentTime from, ContentTime to);
+	std::list<boost::shared_ptr<ContentImageSubtitle> > get_image_subtitles (ContentTimePeriod period);
+	std::list<boost::shared_ptr<ContentTextSubtitle> > get_text_subtitles (ContentTimePeriod period);
 
 protected:
 	void seek (ContentTime, bool);
 	
-	void image_subtitle (ContentTime from, ContentTime to, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
+	void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
 	void text_subtitle (std::list<dcp::SubtitleString>);
 
 	std::list<boost::shared_ptr<ContentImageSubtitle> > _decoded_image_subtitles;
@@ -49,7 +49,7 @@ protected:
 
 private:
 	template <class T>
-	std::list<boost::shared_ptr<T> > get (std::list<boost::shared_ptr<T> > const & subs, ContentTime from, ContentTime to);
+	std::list<boost::shared_ptr<T> > get (std::list<boost::shared_ptr<T> > const & subs, ContentTimePeriod period);
 };
 
 #endif