Verify Id in ContentVersion.

[libdcp.git] / src / reel_stereo_picture_asset.cc

diff --git a/src/reel_stereo_picture_asset.cc b/src/reel_stereo_picture_asset.cc
index 53419667856e08555cec34b761bc2c819c057a3c..8a169df2195084f2c9eceb2b9b550a1316c0d56e 100644 (file)
--- a/src/reel_stereo_picture_asset.cc
+++ b/src/reel_stereo_picture_asset.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -45,11 +45,6 @@ using std::make_pair;
 using boost::shared_ptr;
 using namespace dcp;
 
-ReelStereoPictureAsset::ReelStereoPictureAsset ()
-{
-
-}
-
 ReelStereoPictureAsset::ReelStereoPictureAsset (boost::shared_ptr<StereoPictureAsset> mxf, int64_t entry_point)
        : ReelPictureAsset (mxf, entry_point)
 {
@@ -63,7 +58,7 @@ ReelStereoPictureAsset::ReelStereoPictureAsset (boost::shared_ptr<const cxml::No
 }
 
 string
-ReelStereoPictureAsset::cpl_node_name () const
+ReelStereoPictureAsset::cpl_node_name (Standard) const
 {
        return "msp-cpl:MainStereoscopicPicture";
 }
@@ -71,11 +66,12 @@ ReelStereoPictureAsset::cpl_node_name () const
 pair<string, string>
 ReelStereoPictureAsset::cpl_node_attribute (Standard standard) const
 {
-       if (standard == INTEROP) {
+       switch (standard) {
+       case INTEROP:
                return make_pair ("xmlns:msp-cpl", "http://www.digicine.com/schemas/437-Y/2007/Main-Stereo-Picture-CPL");
-       } else {
+       case SMPTE:
                return make_pair ("xmlns:msp-cpl", "http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL");
        }
 
-       return make_pair ("", "");
+       DCP_ASSERT (false);
 }