diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-01 14:13:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-01 14:13:10 +0100 |
| commit | 45e6a6df959188bfdb8dfc4906c35d1a3c234b0a (patch) | |
| tree | 4cb99aaf4d8ec3d2c6f157d5315887319de5c0d8 /src/lib/player.cc | |
| parent | 05654d0e1799746a9df3ccab040c92e0ed825cac (diff) | |
Add a Type to Time.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index bb1a4cdeb..380133b61 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -501,7 +501,7 @@ Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ DCPTime s = t - piece->content->position (); - s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (max (DCPTime::Type (0), s.get ())); s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); /* Convert this to the content frame */ @@ -513,7 +513,7 @@ Player::dcp_to_content_audio (shared_ptr<const Piece> piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ DCPTime s = t - piece->content->position (); - s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (max (DCPTime::Type (0), s.get ())); s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); /* Convert this to the content frame */ @@ -525,7 +525,7 @@ Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ DCPTime s = t - piece->content->position (); - s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (max (DCPTime::Type (0), s.get ())); s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); return ContentTime (s + piece->content->trim_start(), piece->frc); |