X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=6e194a6dfe5488c00f134b4b388479ff9518356e;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=4482606f030b08bc98d4db0309b175d0f5e2b5c4;hpb=0b15f493754d1b630338b17f2a6dfc66ccc4f6b7;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 4482606f0..6e194a6df 100644
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -29,7 +29,7 @@
 #include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/exceptions.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcpomatic;
 
@@ -44,7 +44,7 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const
 		mono.reset (new dcp::MonoPictureAsset (_content->path(0)));
 	} catch (dcp::MXFFileError& e) {
 		/* maybe it's stereo */
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 		/* maybe it's stereo */
 	}
 
@@ -55,7 +55,7 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const
 		if (!mono) {
 			throw;
 		}
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 		if (!mono) {
 			throw;
 		}
@@ -76,7 +76,6 @@ VideoMXFDecoder::pass ()
 	double const vfr = _content->active_video_frame_rate (film());
 	int64_t const frame = _next.frames_round (vfr);
 
-
 	if (frame >= _content->video->length()) {
 		return true;
 	}
@@ -93,14 +92,14 @@ VideoMXFDecoder::pass ()
 		video->emit (
 			film(),
 			shared_ptr<ImageProxy> (
-				new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
+				new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::Eye::LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
 				),
 			frame
 			);
 		video->emit (
 			film(),
 			shared_ptr<ImageProxy> (
-				new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
+				new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::Eye::RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
 				),
 			frame
 			);