C++11 tidying.

[libdcp.git] / src / picture_asset_writer_common.cc

diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index eae6318fdb89d1502d51dff69c1541c861ec0c5b..e719be72354d9b7c771d39352679896c40bed015 100644 (file)
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,10 +31,18 @@
     files in the program, then also delete it here.
 */
 
-using boost::shared_ptr;
+
+/** @file  src/picture_asset_writer_common.cc
+ *  @brief Common parts of PictureAssetWriter
+ */
+
+
+using std::shared_ptr;
+
 
 namespace dcp {
 
+
 struct ASDCPStateBase
 {
        ASDCPStateBase ()
@@ -47,14 +55,16 @@ struct ASDCPStateBase
        ASDCP::JP2K::PictureDescriptor picture_descriptor;
 };
 
+
 }
 
+
 template <class P, class Q>
-void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t const * data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t const * data, int size)
 {
        asset->set_file (writer->_file);
 
-       if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) {
+       if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame(data, size, state->frame_buffer))) {
                boost::throw_exception (MiscError ("could not parse J2K frame"));
        }
 
@@ -64,9 +74,9 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard stand
        asset->set_size (Size (state->picture_descriptor.StoredWidth, state->picture_descriptor.StoredHeight));
        asset->set_screen_aspect_ratio (Fraction (state->picture_descriptor.AspectRatio.Numerator, state->picture_descriptor.AspectRatio.Denominator));
 
-       asset->fill_writer_info (&state->writer_info, asset->id(), standard);
+       asset->fill_writer_info (&state->writer_info, asset->id());
 
-       Kumu::Result_t r = state->mxf_writer.OpenWrite (
+       auto r = state->mxf_writer.OpenWrite (
                asset->file()->string().c_str(),
                state->writer_info,
                state->picture_descriptor,
@@ -74,8 +84,8 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard stand
                writer->_overwrite
                );
 
-       if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("could not open MXF file for writing", asset->file()->string(), r));
+       if (ASDCP_FAILURE(r)) {
+               boost::throw_exception (MXFFileError("could not open MXF file for writing", asset->file()->string(), r));
        }
 
        writer->_started = true;