Use an enum class for Marker.

[libdcp.git] / src / stereo_picture_asset.cc

diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index d78b4c2c881b5498dd76e1824e44e5d514e0c7ed..0dfba553b1ac74c25867f1881c475ddc78d27dbd 100644 (file)
--- a/src/stereo_picture_asset.cc
+++ b/src/stereo_picture_asset.cc
@@ -42,8 +42,8 @@
 using std::string;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using namespace dcp;
 
 StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file)
@@ -57,14 +57,14 @@ StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file)
 
        ASDCP::JP2K::PictureDescriptor desc;
        if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) {
-               boost::throw_exception (DCPReadError ("could not read video MXF information"));
+               boost::throw_exception (ReadError ("could not read video MXF information"));
        }
 
        read_picture_descriptor (desc);
 
        ASDCP::WriterInfo info;
        if (ASDCP_FAILURE (reader.FillWriterInfo (info))) {
-               boost::throw_exception (DCPReadError ("could not read video MXF information"));
+               boost::throw_exception (ReadError ("could not read video MXF information"));
        }
 
        _id = read_writer_info (info);
@@ -107,11 +107,11 @@ StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt,
 
        ASDCP::JP2K::PictureDescriptor desc_A;
        if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) {
-               boost::throw_exception (DCPReadError ("could not read video MXF information"));
+               boost::throw_exception (ReadError ("could not read video MXF information"));
        }
        ASDCP::JP2K::PictureDescriptor desc_B;
        if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) {
-               boost::throw_exception (DCPReadError ("could not read video MXF information"));
+               boost::throw_exception (ReadError ("could not read video MXF information"));
        }
 
        if (!descriptor_equals (desc_A, desc_B, note)) {
@@ -132,7 +132,7 @@ StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt,
                try {
                        frame_A = reader->get_frame (i);
                        frame_B = other_reader->get_frame (i);
-               } catch (DCPReadError& e) {
+               } catch (ReadError& e) {
                        /* If there was a problem reading the frame data we'll just assume
                           the two frames are not equal.
                        */
@@ -142,8 +142,8 @@ StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt,
 
                if (!frame_buffer_equals (
                            i, opt, note,
-                           frame_A->left_j2k_data(), frame_A->left_j2k_size(),
-                           frame_B->left_j2k_data(), frame_B->left_j2k_size()
+                           frame_A->left()->data(), frame_A->left()->size(),
+                           frame_B->left()->data(), frame_B->left()->size()
                            )) {
                        result = false;
                        if (!opt.keep_going) {
@@ -153,8 +153,8 @@ StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt,
 
                if (!frame_buffer_equals (
                            i, opt, note,
-                           frame_A->right_j2k_data(), frame_A->right_j2k_size(),
-                           frame_B->right_j2k_data(), frame_B->right_j2k_size()
+                           frame_A->right()->data(), frame_A->right()->size(),
+                           frame_B->right()->data(), frame_B->right()->size()
                            )) {
                        result = false;
                        if (!opt.keep_going) {