diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-06 22:01:45 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-06 22:01:45 +0000 |
| commit | 7e479483826381699915aa90cc26736e3d2c76ed (patch) | |
| tree | 40ce6ee1a2ec6c726701bf70320931fe2d761c1f /src | |
| parent | 79ce26d031d109177ba4b0f637fa2960345a37a3 (diff) | |
Build fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 4 | ||||
| -rw-r--r-- | src/lib/video_content.h | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_create.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 59d046956..3859915f8 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -275,7 +275,7 @@ Player::emit_video (weak_ptr<Piece> weak_piece, shared_ptr<DecodedVideo> video) FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate()); - dcp::Size const image_size = content->scale().size (content, _video_container_size); + dcp::Size image_size = content->scale().size (content, _video_container_size); if (_approximate_size) { image_size.width &= ~3; image_size.height &= ~3; diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index b33a37cb8..a03300a6b 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -436,8 +436,8 @@ VideoContentScale::name () const return _("No scale"); } -libdcp::Size -VideoContentScale::size (shared_ptr<const VideoContent> c, libdcp::Size container) const +dcp::Size +VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size container) const { if (_ratio) { return fit_ratio_within (_ratio->ratio (), container); diff --git a/src/lib/video_content.h b/src/lib/video_content.h index ebd9f8c72..a82c6c221 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -45,7 +45,7 @@ public: VideoContentScale (bool); VideoContentScale (boost::shared_ptr<cxml::Node>); - libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size) const; + dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size) const; std::string id () const; std::string name () const; void as_xml (xmlpp::Node *) const; diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 36e04120e..1b985a918 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -190,7 +190,7 @@ main (int argc, char* argv[]) for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i); if (ic) { - ic->set_video_length (still_length * 24); + ic->set_video_length (ContentTime::from_seconds (still_length)); } } |