diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-16 00:53:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-16 00:53:54 +0100 |
| commit | 4a4725e41bf4070969223f9c40885063c50e61d0 (patch) | |
| tree | 7c8896f8080b7bf66773d5b63ded45b83b675712 /src/lib/player.cc | |
| parent | 6300edd66433dffed9fb30a0b3b8db7ca3355809 (diff) | |
float -> double in a few places.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 0a4eb54e7..b00df4e23 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -309,7 +309,7 @@ Player::black_player_video_frame (DCPTime time) const shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)), time, Crop (), - optional<float> (), + optional<double> (), _video_container_size, _video_container_size, EYES_BOTH, @@ -524,6 +524,10 @@ Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content); DCPTime s = t - piece->content->position (); s = min (piece->content->length_after_trim(), s); + std::cout << "s=" << s << " " << ContentTime(s, piece->frc) << "\n"; + std::cout << (ContentTime (s, piece->frc) + piece->content->trim_start ()) << "\n"; + std::cout << s.get() << "\n"; + std::cout << (s.get() * 24.0 / 96000) << "\n"; return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start ()).frames (vc->video_frame_rate ()); } |
