diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-26 16:47:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-26 22:32:11 +0100 |
| commit | f188128e2577942f030374631d3cf1324a00624a (patch) | |
| tree | 72c1b82d5b7f90069b7ba2a05e8b209cd527c3e4 /src/lib/player.h | |
| parent | c4ea2ff06b31ccd20daadbdc968e397eb13a7e36 (diff) | |
{Video,Audio}Frame -> Frame.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index d8b13ee7b..a5194a169 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -116,9 +116,9 @@ private: void film_changed (Film::Property); std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const; void update_subtitle_from_text (); - VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const; - DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, VideoFrame f) const; - AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const; + 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; ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const; boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const; |