diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-25 09:55:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-01 16:43:36 +0100 |
| commit | 024b0f74e66f718b605ad3a1e4994e7547ffb4ef (patch) | |
| tree | 8741a82e1393c4612523d209fde52a588d8f94cb /src/lib/player.h | |
| parent | fba5241b24e0b7ba7d428bbc1d34edbc239d6c58 (diff) | |
wip: allow multi-content pieces.1771-resample-glitches-take3
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 3 |
1 files changed, 2 insertions, 1 deletions
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; |