From 024b0f74e66f718b605ad3a1e4994e7547ffb4ef Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 25 Jun 2020 09:55:19 +0200
Subject: wip: allow multi-content pieces.

---
 src/lib/player.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/player.h')

diff --git a/src/lib/player.h b/src/lib/player.h
index eb1b4ea36..2ae1628c3 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -122,6 +122,7 @@ private:
 	void construct ();
 	void setup_pieces ();
 	void setup_pieces_unlocked ();
+	std::vector<ContentList> coalesce (ContentList const& content) const;
 	void flush ();
 	void film_change (ChangeType, Film::Property);
 	void playlist_change (ChangeType);
@@ -132,7 +133,7 @@ private:
 	void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
 	void bitmap_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentBitmapText);
 	void plain_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentStringText);
-	void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, dcpomatic::ContentTime);
+	void text_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, dcpomatic::ContentTime);
 	void atmos (boost::weak_ptr<Piece>, ContentAtmos);
 
 	dcpomatic::DCPTime one_video_frame () const;
-- 
cgit v1.2.3