From 1fcc2d967b50d0a09a6f4cc2ab47d3d2206911a4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jun 2020 13:09:09 +0200 Subject: I believe atmos_id is a unique identifier, so create it in the same way that all the others are created. --- src/atmos_asset.cc | 4 ++-- src/atmos_asset.h | 2 +- tools/dcpdecryptmxf.cc | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc index 3924e43a..c4c88568 100644 --- a/src/atmos_asset.cc +++ b/src/atmos_asset.cc @@ -41,14 +41,14 @@ using std::string; using boost::shared_ptr; using namespace dcp; -AtmosAsset::AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_count, int max_object_count, string atmos_id, int atmos_version) +AtmosAsset::AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_count, int max_object_count, int atmos_version) : MXF (SMPTE) , _edit_rate (edit_rate) , _intrinsic_duration (0) , _first_frame (first_frame) , _max_channel_count (max_channel_count) , _max_object_count (max_object_count) - , _atmos_id (atmos_id) + , _atmos_id (make_uuid()) , _atmos_version (atmos_version) { diff --git a/src/atmos_asset.h b/src/atmos_asset.h index 61f94055..f7794a2a 100644 --- a/src/atmos_asset.h +++ b/src/atmos_asset.h @@ -45,7 +45,7 @@ class AtmosAssetWriter; class AtmosAsset : public Asset, public MXF { public: - AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_count, int max_object_count, std::string atmos_id, int atmos_version); + AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_count, int max_object_count, int atmos_version); explicit AtmosAsset (boost::filesystem::path file); boost::shared_ptr start_write (boost::filesystem::path file); diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc index 5d04d0fc..34ebf436 100644 --- a/tools/dcpdecryptmxf.cc +++ b/tools/dcpdecryptmxf.cc @@ -141,7 +141,6 @@ main (int argc, char* argv[]) in.first_frame(), in.max_channel_count(), in.max_object_count(), - in.atmos_id(), in.atmos_version() ); shared_ptr writer = out.start_write (output_file.get()); -- cgit v1.2.3