diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-08-30 00:59:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-08-30 00:59:26 +0100 |
| commit | 9ba99535750e19c341f6ff535c6c8991658a8fbb (patch) | |
| tree | b00e41294fe3129d99d9734086a17948e7d96483 /src/lib/player.h | |
| parent | d81db4280dd09ea9d0064272b075667d659b594a (diff) | |
Fix incorrect reel lengths in some cases; account for emitted data being rejected by the player, and for initial audio not to be at time 0.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 9dd5afd26..ed55b6284 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -105,8 +105,8 @@ private: ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, DCPTime t) const; DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const; boost::shared_ptr<PlayerVideo> black_player_video_frame () const; - void video (boost::weak_ptr<Piece>, ContentVideo); - void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio); + bool video (boost::weak_ptr<Piece>, ContentVideo); + Frame audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio); void image_subtitle_start (boost::weak_ptr<Piece>, ContentImageSubtitle); void text_subtitle_start (boost::weak_ptr<Piece>, ContentTextSubtitle); void subtitle_stop (boost::weak_ptr<Piece>, ContentTime); |
