Use an enum class for Marker.

[libdcp.git] / src / atmos_asset.h

diff --git a/src/atmos_asset.h b/src/atmos_asset.h
index 8e9190c88cef37572c21c659de9d286b74faa043..6e1894e7669a0062f1988455581910b81683d7a1 100644 (file)
--- a/src/atmos_asset.h
+++ b/src/atmos_asset.h
@@ -45,13 +45,16 @@ 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);
-       boost::shared_ptr<AtmosAssetReader> start_read () const;
+       std::shared_ptr<AtmosAssetWriter> start_write (boost::filesystem::path file);
+       std::shared_ptr<AtmosAssetReader> start_read () const;
 
-       std::string pkl_type (Standard) const;
+       static std::string static_pkl_type (Standard);
+       std::string pkl_type (Standard s) const {
+               return static_pkl_type (s);
+       }
 
        Fraction edit_rate () const {
                return _edit_rate;