Tidying.

[libdcp.git] / src / mono_picture_asset.cc

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 89661061c482f544c3ebfb09237361bae7ce2b3b..78ab87098dc6c4c381201bff665e0b3c7500a027 100644 (file)
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -31,6 +31,12 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/mono_picture_asset.cc
+ *  @brief MonoPictureAsset class
+ */
+
+
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
 #include "mono_picture_asset_reader.h"
@@ -41,6 +47,7 @@
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
+
 using std::string;
 using std::vector;
 using std::list;
@@ -53,6 +60,7 @@ using namespace boost::placeholders;
 #endif
 using namespace dcp;
 
+
 MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
        : PictureAsset (file)
 {
@@ -77,18 +85,21 @@ 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)
 {
        notes.push_back (make_pair (t, s));
 }
 
+
 bool
 MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
 {
@@ -170,16 +181,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)
 {
-       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, overwrite));
 }
 
 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