path -> dir, name for MXFs.

[libdcp.git] / src / picture_asset.cc

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 383d218a6440f9799885bef088f902c3ee44c9df..db3f02c3c89857c512ebb53a40a97d273972285e 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -30,6 +30,7 @@
 #include "KM_fileio.h"
 #include "picture_asset.h"
 #include "util.h"
+#include "exceptions.h"
 
 using namespace std;
 using namespace boost;
@@ -37,13 +38,14 @@ using namespace libdcp;
 
 PictureAsset::PictureAsset (
        sigc::slot<string, int> get_path,
-       string mxf_path,
+       string directory,
+       string mxf_name,
        sigc::signal1<void, float>* progress,
        int fps,
        int length,
        int width,
        int height)
-       : Asset (mxf_path, progress, fps, length)
+       : Asset (directory, mxf_name, progress, fps, length)
        , _width (width)
        , _height (height)
 {
@@ -52,19 +54,28 @@ PictureAsset::PictureAsset (
 
 PictureAsset::PictureAsset (
        vector<string> const & files,
-       string mxf_path,
+       string directory,
+       string mxf_name,
        sigc::signal1<void, float>* progress,
        int fps,
        int length,
        int width,
        int height)
-       : Asset (mxf_path, progress, fps, length)
+       : Asset (directory, mxf_name, progress, fps, length)
        , _width (width)
        , _height (height)
 {
        construct (sigc::bind (sigc::mem_fun (*this, &PictureAsset::path_from_list), files));
 }
 
+PictureAsset::PictureAsset (string directory, string mxf_name, int fps, int length, int width, int height)
+       : Asset (directory, mxf_name, 0, fps, length)
+       , _width (width)
+       , _height (height)
+{
+
+}
+
 string
 PictureAsset::path_from_list (int f, vector<string> const & files) const
 {
@@ -77,9 +88,7 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
        ASDCP::JP2K::CodestreamParser j2k_parser;
        ASDCP::JP2K::FrameBuffer frame_buffer (4 * Kumu::Megabyte);
        if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (get_path(0).c_str(), frame_buffer))) {
-               stringstream s;
-               s << "could not open " << get_path(0) << " for reading";
-               throw runtime_error (s.str());
+               throw FileError ("could not open JPEG2000 file for reading", get_path (0));
        }
        
        ASDCP::JP2K::PictureDescriptor picture_desc;
@@ -90,8 +99,8 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
        fill_writer_info (&writer_info);
        
        ASDCP::JP2K::MXFWriter mxf_writer;
-       if (ASDCP_FAILURE (mxf_writer.OpenWrite (_mxf_path.c_str(), writer_info, picture_desc))) {
-               throw runtime_error ("could not open MXF for writing");
+       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, picture_desc))) {
+               throw FileError ("could not open MXF file for writing", mxf_path().string());
        }
 
        for (int i = 0; i < _length; ++i) {
@@ -99,24 +108,22 @@ PictureAsset::construct (sigc::slot<string, int> get_path)
                string const path = get_path (i);
                
                if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (path.c_str(), frame_buffer))) {
-                       stringstream s;
-                       s << "could not open " << path << " for reading";
-                       throw runtime_error (s.str());
+                       throw FileError ("could not open JPEG2000 file for reading", path);
                }
 
                /* XXX: passing 0 to WriteFrame ok? */
                if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) {
-                       throw runtime_error ("error in writing video MXF");
+                       throw MiscError ("error in writing video MXF");
                }
                
                (*_progress) (0.5 * float (i) / _length);
        }
        
        if (ASDCP_FAILURE (mxf_writer.Finalize())) {
-               throw runtime_error ("error in finalising video MXF");
+               throw MiscError ("error in finalising video MXF");
        }
 
-       _digest = make_digest (_mxf_path, _progress);
+       _digest = make_digest (mxf_path().string(), _progress);
 }
 
 void
@@ -124,7 +131,7 @@ PictureAsset::write_to_cpl (ostream& s) const
 {
        s << "        <MainPicture>\n"
          << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "          <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
+         << "          <AnnotationText>" << _mxf_name << "</AnnotationText>\n"
          << "          <EditRate>" << _fps << " 1</EditRate>\n"
          << "          <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n"
          << "          <EntryPoint>0</EntryPoint>\n"