diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-14 12:43:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-14 12:43:08 +0100 |
| commit | a0614e6e3b566827381121fdb4ee73268281a70d (patch) | |
| tree | 97fb96cceb7c776a32775e7e5fde1769c9c837e6 /src/lib/player.h | |
| parent | 8843d281ba06613fc92711d2ea824c35502be78e (diff) | |
Tests of Player::dcp_to_content_video, content_video_to_dcp and
dcp_to_content_audio with some subtle and hopefully reasonable
fixes.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 0abb02daa..9b2e27251 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -109,6 +109,9 @@ private: friend class PlayerWrapper; friend class Piece; friend struct player_overlaps_test; + friend struct player_time_calculation_test1; + friend struct player_time_calculation_test2; + friend struct player_time_calculation_test3; void setup_pieces (); void flush (); @@ -119,7 +122,7 @@ private: void update_subtitle_from_text (); Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const; DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const; - Frame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const; + Frame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, AudioStreamPtr stream, DCPTime t) const; ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const; boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const; |