summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-09 09:36:58 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-09 09:36:58 +0100
commit2cf3da72a017eebf741dfb9a5ec158df94a4e7b7 (patch)
tree2fcc142d132fb1de2228cfca201a4e0825415dc8 /src/lib/player.cc
parent02de0e70ffa175861fb4392e9df4e5a7c1579375 (diff)
Basics of DCP import.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index ebec19b2d..9f9f8db2e 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -43,6 +43,8 @@
#include "content_video.h"
#include "player_video.h"
#include "frame_rate_change.h"
+#include "dcp_content.h"
+#include "dcp_decoder.h"
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
@@ -120,6 +122,12 @@ Player::setup_pieces ()
frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate());
}
+ shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (*i);
+ if (dc) {
+ decoder.reset (new DCPDecoder (dc, _film->log ()));
+ frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate());
+ }
+
/* ImageContent */
shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
if (ic) {