Various tweaks for Windows builds.

[libdcp.git] / src / picture_asset.cc

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 3888ca723faa7dc19fdee8687620821541e55dd5..eb06012f2264644c752e1e80d0ec53a5c01f82c4 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -30,13 +30,14 @@
 #include "KM_fileio.h"
 #include "picture_asset.h"
 #include "util.h"
+#include "exceptions.h"
 
 using namespace std;
 using namespace boost;
 using namespace libdcp;
 
 PictureAsset::PictureAsset (
-       list<string> const & files,
+       sigc::slot<string, int> get_path,
        string mxf_path,
        sigc::signal1<void, float>* progress,
        int fps,
@@ -46,13 +47,38 @@ PictureAsset::PictureAsset (
        : Asset (mxf_path, progress, fps, length)
        , _width (width)
        , _height (height)
+{
+       construct (get_path);
+}
+
+PictureAsset::PictureAsset (
+       vector<string> const & files,
+       string mxf_path,
+       sigc::signal1<void, float>* progress,
+       int fps,
+       int length,
+       int width,
+       int height)
+       : Asset (mxf_path, progress, fps, length)
+       , _width (width)
+       , _height (height)
+{
+       construct (sigc::bind (sigc::mem_fun (*this, &PictureAsset::path_from_list), files));
+}
+
+string
+PictureAsset::path_from_list (int f, vector<string> const & files) const
+{
+       return files[f];
+}
+
+void
+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 (files.front().c_str(), frame_buffer))) {
-               stringstream s;
-               s << "could not open " << files.front() << " for reading";
-               throw runtime_error (s.str());
+       if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (get_path(0).c_str(), frame_buffer))) {
+               throw FileError ("could not open JPEG2000 file for reading", get_path (0));
        }
        
        ASDCP::JP2K::PictureDescriptor picture_desc;
@@ -64,28 +90,27 @@ PictureAsset::PictureAsset (
        
        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");
+               throw FileError ("could not open MXF file for writing", _mxf_path);
        }
 
-       int j = 0;
-       for (list<string>::const_iterator i = files.begin(); i != files.end(); ++i) {
-               if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (i->c_str(), frame_buffer))) {
-                       stringstream s;
-                       s << "could not open " << *i << " for reading";
-                       throw runtime_error (s.str());
+       for (int i = 0; i < _length; ++i) {
+
+               string const path = get_path (i);
+               
+               if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (path.c_str(), frame_buffer))) {
+                       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");
                }
                
-               ++j;
-               (*_progress) (0.5 * float (j) / files.size ());
+               (*_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);
@@ -96,7 +121,11 @@ PictureAsset::write_to_cpl (ostream& s) const
 {
        s << "        <MainPicture>\n"
          << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
+#if BOOST_FILESYSTEM_VERSION == 3
+         << "          <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n"
+#else          
          << "          <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
+#endif         
          << "          <EditRate>" << _fps << " 1</EditRate>\n"
          << "          <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n"
          << "          <EntryPoint>0</EntryPoint>\n"