Some compilers don't like x = {} where x is a boost::optional<string>

[libdcp.git] / src / asset_factory.cc

diff --git a/src/asset_factory.cc b/src/asset_factory.cc
index 09c315d5f66a6076c7ed69d60ee91b1b3f7b3b3e..e02281d2f980c9b4ab9bf705ec008e084d60cd8f 100644 (file)
--- a/src/asset_factory.cc
+++ b/src/asset_factory.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,6 +31,12 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/asset_factory.cc
+ *  @brief asset_factory() method
+ */
+
+
 #include "mono_picture_asset.h"
 #include "stereo_picture_asset.h"
 #include "sound_asset.h"
@@ -39,11 +45,14 @@
 #include "atmos_asset.h"
 #include "compose.hpp"
 #include "asset_factory.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
-using boost::shared_ptr;
+
+using std::shared_ptr;
+using std::make_shared;
 using namespace dcp;
 
+
 shared_ptr<Asset>
 dcp::asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_mxf_type)
 {
@@ -61,27 +70,27 @@ dcp::asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_
                throw ReadError ("MPEG2 video essences are not supported");
        case ASDCP::ESS_JPEG_2000:
                try {
-                       return shared_ptr<MonoPictureAsset> (new MonoPictureAsset (path));
+                       return make_shared<MonoPictureAsset>(path);
                } catch (dcp::MXFFileError& e) {
                        if (ignore_incorrect_picture_mxf_type && e.number() == ASDCP::RESULT_SFORMAT) {
                                /* Tried to load it as mono but the error says it's stereo; try that instead */
-                               return shared_ptr<StereoPictureAsset> (new StereoPictureAsset (path));
+                               return make_shared<StereoPictureAsset>(path);
                        } else {
                                throw;
                        }
                }
        case ASDCP::ESS_PCM_24b_48k:
        case ASDCP::ESS_PCM_24b_96k:
-               return shared_ptr<SoundAsset> (new SoundAsset (path));
+               return make_shared<SoundAsset>(path);
        case ASDCP::ESS_JPEG_2000_S:
-               return shared_ptr<StereoPictureAsset> (new StereoPictureAsset (path));
+               return make_shared<StereoPictureAsset>(path);
        case ASDCP::ESS_TIMED_TEXT:
-               return shared_ptr<SMPTESubtitleAsset> (new SMPTESubtitleAsset (path));
+               return make_shared<SMPTESubtitleAsset>(path);
        case ASDCP::ESS_DCDATA_DOLBY_ATMOS:
-               return shared_ptr<AtmosAsset> (new AtmosAsset (path));
+               return make_shared<AtmosAsset>(path);
        default:
-               throw ReadError (String::compose ("Unknown MXF essence type %1 in %2", int(type), path.string()));
+               throw ReadError (String::compose("Unknown MXF essence type %1 in %2", static_cast<int>(type), path.string()));
        }
 
-       return shared_ptr<Asset>();
+       return {};
 }