Use MXFAsset::_interop to decide on whether to write asset XML as Interop or SMPTE.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 51aa560c706297a0658c5744808c1cbc9698d2c3..ff51c025b78dd664ebd9a47e827e77b042bf42c0 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -21,6 +21,8 @@
 #include "reel.h"
 #include "util.h"
 #include "picture_asset.h"
+#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
 #include "sound_asset.h"
 #include "subtitle_asset.h"
 #include "kdm.h"
@@ -29,25 +31,32 @@ using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 using namespace libdcp;
 
 void
-Reel::write_to_cpl (xmlpp::Element* node, bool interop) const
+Reel::write_to_cpl (xmlpp::Element* node) const
 {
        xmlpp::Element* reel = node->add_child ("Reel");
        reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
        xmlpp::Element* asset_list = reel->add_child ("AssetList");
        
-       if (_main_picture) {
-               _main_picture->write_to_cpl (asset_list, interop);
+       if (_main_picture && dynamic_pointer_cast<MonoPictureAsset> (_main_picture)) {
+               /* Mono pictures come before other stuff... */
+               _main_picture->write_to_cpl (asset_list);
        }
 
        if (_main_sound) {
-               _main_sound->write_to_cpl (asset_list, interop);
+               _main_sound->write_to_cpl (asset_list);
        }
 
        if (_main_subtitle) {
-               _main_subtitle->write_to_cpl (asset_list, interop);
+               _main_subtitle->write_to_cpl (asset_list);
+       }
+
+       if (_main_picture && dynamic_pointer_cast<StereoPictureAsset> (_main_picture)) {
+               /* ... but stereo pictures must come after */
+               _main_picture->write_to_cpl (asset_list);
        }
 }