Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / src / reel_sound_asset.h

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index da15011190853125ea6896766f2a13470f77fe68..0b4d0f9d2e9fed5d12b7aa6a42c86b7a96e465b4 100644 (file)
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,42 +31,46 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_sound_asset.h
- *  @brief ReelSoundAsset class.
+ *  @brief ReelSoundAsset class
  */
 
-#include "reel_mxf.h"
-#include "reel_asset.h"
+
+#include "reel_file_asset.h"
 #include "sound_asset.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <string>
 
+
 namespace dcp {
 
+
 /** @class ReelSoundAsset
- *  @brief Part of a Reel's description which refers to a sound asset.
+ *  @brief Part of a Reel's description which refers to a sound asset
  */
-class ReelSoundAsset : public ReelAsset, public ReelMXF
+class ReelSoundAsset : public ReelFileAsset
 {
 public:
-       ReelSoundAsset (boost::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
-       explicit ReelSoundAsset (boost::shared_ptr<const cxml::Node>);
+       ReelSoundAsset (std::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
+       explicit ReelSoundAsset (std::shared_ptr<const cxml::Node>);
 
-       void write_to_cpl (xmlpp::Node* node, Standard standard) const;
+       bool equals (std::shared_ptr<const ReelSoundAsset>, EqualityOptions, NoteHandler) const;
 
        /** @return the SoundAsset that this object refers to */
-       boost::shared_ptr<SoundAsset> asset () {
-               return asset_of_type<SoundAsset> ();
+       std::shared_ptr<SoundAsset> asset () {
+               return asset_of_type<SoundAsset>();
        }
 
        /** @return the SoundAsset that this object refers to */
-       boost::shared_ptr<const SoundAsset> asset () const {
-               return asset_of_type<const SoundAsset> ();
+       std::shared_ptr<const SoundAsset> asset () const {
+               return asset_of_type<const SoundAsset>();
        }
 
 private:
-       std::string key_type () const;
-       std::string cpl_node_name () const;
+       boost::optional<std::string> key_type () const;
+       std::string cpl_node_name (Standard standard) const;
 };
 
+
 }