diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-05 15:30:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-06 20:15:49 +0200 |
| commit | 198ea7d7dbd0140f3eeea2cc35ae9f0312ea78a1 (patch) | |
| tree | fef12293f6ede597b806b3c6328a2bceb4c59bec | |
| parent | 0a1d944d74308ccb940194bcb627652c72128650 (diff) | |
Use a template to clean things up a little.
| -rw-r--r-- | src/lib/kdm_with_metadata.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h index e7b3c23ba..8710460ed 100644 --- a/src/lib/kdm_with_metadata.h +++ b/src/lib/kdm_with_metadata.h @@ -104,10 +104,11 @@ void email ( ); -class DCPKDMWithMetadata : public KDMWithMetadata +template <class T> +class SpecialKDMWithMetadata : public KDMWithMetadata { public: - DCPKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, dcp::EncryptedKDM k) + SpecialKDMWithMetadata (dcp::NameFormat::Map const& name_values, boost::shared_ptr<Cinema> cinema, T k) : KDMWithMetadata (name_values, cinema) , kdm (k) {} @@ -120,28 +121,13 @@ public: return kdm.as_xml (out); } - dcp::EncryptedKDM kdm; + T kdm; }; +typedef SpecialKDMWithMetadata<dcp::EncryptedKDM> DCPKDMWithMetadata; #ifdef DCPOMATIC_VARIANT_SWAROOP -class ECinemaKDMWithMetadata : public KDMWithMetadata -{ -public: - ECinemaKDMWithMetadata (dcp::NameValues::Map const& name_values, boost::shared_ptr<Cinema> cinema, EncryptedECinemaKDM k) - : KDMWithMetadata (name_values, cinema) - , kdm (k) - {} - - std::string kdm_as_xml () const { - return kdm.as_xml (); - } - - void kdm_as_xml (boost::filesystem::path out) const { - return kdm.as_xml (out); - } - - EncryptedECinemaKDM kdm; -}; +typedef SpecialKDMWithMetadata<EncryptedECinemaKDM> ECinemaKDMWithMetadata; #endif #endif + |