I believe atmos_id is a unique identifier, so create it in the

same way that all the others are created.

diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc
index 3924e43a2e83822528c0288f4a53a97395f8377d..c4c885681c0638fc42bef33707e6095cec2d7681 100644 (file)
--- 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 61f940557127d8ccbd57dc3c0f62ac4e6b4f2bf0..f7794a2a2614b1c8d54102b57015c238d7faeb06 100644 (file)
--- 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<AtmosAssetWriter> start_write (boost::filesystem::path file);

diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc
index 5d04d0fcb9e706644be6f6976bc23d21430d2752..34ebf436878c163fe778fde49c0cfffd38bf20c3 100644 (file)
--- 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<dcp::AtmosAssetWriter> writer = out.start_write (output_file.get());