namespace libdcp -> dcp.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 474b0715438c5817fdc3c044f4195f14a117ca9b..964b543b8612f77cc70a196e43b3b7a732fade0a 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -32,17 +32,18 @@
 
 using std::string;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 /** Make a picture frame from a 2D (monoscopic) asset.
  *  @param mxf_path Path to the asset's MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
  */
-MonoPictureFrame::MonoPictureFrame (string mxf_path, int n, ASDCP::AESDecContext* c)
+MonoPictureFrame::MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext* c)
 {
        ASDCP::JP2K::MXFReader reader;
-       if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
-               boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path));
+       Kumu::Result_t r = reader.OpenRead (mxf_path.string().c_str());
+       if (ASDCP_FAILURE (r)) {
+               boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path, r));
        }
 
        /* XXX: unfortunate guesswork on this buffer size */