Bump asdcplib to dcpomatic-2.13.0 branch.

[libdcp.git] / src / mono_picture_asset.cc

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 89661061c482f544c3ebfb09237361bae7ce2b3b..9a0beb42458f0aa472006a54c5e677515c4e6ab3 100644 (file)
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -31,33 +31,44 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/mono_picture_asset.cc
+ *  @brief MonoPictureAsset class
+ */
+
+
+#include "compose.hpp"
+#include "dcp_assert.h"
+#include "equality_options.h"
+#include "exceptions.h"
+#include "filesystem.h"
 #include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
 #include "mono_picture_asset_reader.h"
-#include "exceptions.h"
-#include "dcp_assert.h"
+#include "mono_picture_asset_writer.h"
 #include "mono_picture_frame.h"
-#include "compose.hpp"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
-using std::string;
-using std::vector;
+
+using std::dynamic_pointer_cast;
 using std::list;
+using std::make_shared;
 using std::pair;
 using std::shared_ptr;
-using std::dynamic_pointer_cast;
-using std::make_shared;
+using std::string;
+using std::vector;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 using namespace dcp;
 
+
 MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
        : PictureAsset (file)
 {
-       ASDCP::JP2K::MXFReader reader;
-       auto r = reader.OpenRead (file.string().c_str());
+       Kumu::FileReaderFactory factory;
+       ASDCP::JP2K::MXFReader reader(factory);
+       auto r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str());
        if (ASDCP_FAILURE(r)) {
                boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r));
        }
@@ -77,35 +88,39 @@ MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
        _id = read_writer_info (info);
 }
 
+
 MonoPictureAsset::MonoPictureAsset (Fraction edit_rate, Standard standard)
        : PictureAsset (edit_rate, standard)
 {
 
 }
 
+
 static void
-storing_note_handler (list<pair<NoteType, string> >& notes, NoteType t, string s)
+storing_note_handler (list<pair<NoteType, string>>& notes, NoteType t, string s)
 {
        notes.push_back (make_pair (t, s));
 }
 
+
 bool
-MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
+MonoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (!dynamic_pointer_cast<const MonoPictureAsset>(other)) {
                return false;
        }
 
-       ASDCP::JP2K::MXFReader reader_A;
+       Kumu::FileReaderFactory factory;
+       ASDCP::JP2K::MXFReader reader_A(factory);
        DCP_ASSERT (_file);
-       auto r = reader_A.OpenRead (_file->string().c_str());
+       auto r = reader_A.OpenRead(dcp::filesystem::fix_long_path(*_file).string().c_str());
        if (ASDCP_FAILURE(r)) {
                boost::throw_exception (MXFFileError("could not open MXF file for reading", _file->string(), r));
        }
 
-       ASDCP::JP2K::MXFReader reader_B;
+       ASDCP::JP2K::MXFReader reader_B(factory);
        DCP_ASSERT (other->file ());
-       r = reader_B.OpenRead (other->file()->string().c_str());
+       r = reader_B.OpenRead(dcp::filesystem::fix_long_path(*other->file()).string().c_str());
        if (ASDCP_FAILURE (r)) {
                boost::throw_exception (MXFFileError ("could not open MXF file for reading", other->file()->string(), r));
        }
@@ -145,7 +160,7 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
                        auto frame_A = reader->get_frame (i);
                        auto frame_B = other_reader->get_frame (i);
 
-                       list<pair<NoteType, string> > notes;
+                       list<pair<NoteType, string>> notes;
 
                        if (!frame_buffer_equals (
                                    i, opt, bind (&storing_note_handler, boost::ref(notes), _1, _2),
@@ -170,16 +185,20 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
        return result;
 }
 
+
 shared_ptr<PictureAssetWriter>
-MonoPictureAsset::start_write (boost::filesystem::path file, bool overwrite)
+MonoPictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour)
 {
-       return make_shared<MonoPictureAssetWriter>(this, file, overwrite);
+       /* Can't use make_shared here as the MonoPictureAssetWriter constructor is private */
+       return shared_ptr<MonoPictureAssetWriter>(new MonoPictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING));
 }
 
 shared_ptr<MonoPictureAssetReader>
 MonoPictureAsset::start_read () const
 {
-       return make_shared<MonoPictureAssetReader>(this, key(), standard());
+       /* Can't use make_shared here as the MonoPictureAssetReader constructor is private */
+       return shared_ptr<MonoPictureAssetReader>(new MonoPictureAssetReader(this, key(), standard()));
+
 }
 
 string