Move _intrinsic_duration and _edit_rate up to the MXF class as XML subtitle files...

[libdcp.git] / src / reel_picture_asset.cc

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 9fdc3b9e549ee6bc3dc20f78c824d0415b8be44d..344f7019cb28f708221573468a9c33e2803c6f60 100644 (file)
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -17,17 +17,21 @@
 
 */
 
+/** @file  src/reel_picture_asset.h
+ *  @brief ReelPictureAsset class.
+ */
+
 #include "content.h"
 #include "reel_picture_asset.h"
 #include "picture_mxf.h"
 #include "compose.hpp"
 #include <libcxml/cxml.h>
+#include <iomanip>
 
 using std::bad_cast;
 using std::string;
 using std::stringstream;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using namespace dcp;
 
 ReelPictureAsset::ReelPictureAsset ()
@@ -37,15 +41,15 @@ ReelPictureAsset::ReelPictureAsset ()
 
 }
 
-ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureMXF> content, int64_t entry_point)
-       : ReelAsset (content, entry_point)
+ReelPictureAsset::ReelPictureAsset (boost::shared_ptr<PictureMXF> content, int64_t entry_point)
+       : ReelAsset (content, content->edit_rate(), content->intrinsic_duration(), entry_point)
        , _frame_rate (content->frame_rate ())
        , _screen_aspect_ratio (content->screen_aspect_ratio ())
 {
        
 }
 
-ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
+ReelPictureAsset::ReelPictureAsset (boost::shared_ptr<const cxml::Node> node)
        : ReelAsset (node)
 {
        _frame_rate = Fraction (node->string_child ("FrameRate"));