Cleanup: fix more comments/guards (and add check script).

[libdcp.git] / src / reel_sound_asset.h

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index e6143f11a87d26ecfa3004f4d25b5873640d53ad..16d629d1105d3c7e03fab429fd7b6622f6d4ec6b 100644 (file)
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -38,7 +38,6 @@
 
 
 #include "reel_file_asset.h"
-#include "reel_asset.h"
 #include "sound_asset.h"
 #include <memory>
 #include <string>
@@ -50,28 +49,27 @@ namespace dcp {
 /** @class ReelSoundAsset
  *  @brief Part of a Reel's description which refers to a sound asset
  */
-class ReelSoundAsset : public ReelAsset, public ReelFileAsset
+class ReelSoundAsset : public ReelFileAsset
 {
 public:
        ReelSoundAsset (std::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
        explicit ReelSoundAsset (std::shared_ptr<const cxml::Node>);
 
-       xmlpp::Node* 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 */
-       std::shared_ptr<SoundAsset> asset () {
-               return asset_of_type<SoundAsset> ();
+       std::shared_ptr<const SoundAsset> asset () const {
+               return asset_of_type<const SoundAsset>();
        }
 
        /** @return the SoundAsset that this object refers to */
-       std::shared_ptr<const SoundAsset> asset () const {
-               return asset_of_type<const SoundAsset> ();
+       std::shared_ptr<SoundAsset> asset () {
+               return asset_of_type<SoundAsset>();
        }
 
+       bool equals(std::shared_ptr<const ReelSoundAsset>, EqualityOptions const&, NoteHandler) const;
+
 private:
-       std::string key_type () const;
-       std::string cpl_node_name (Standard standard) const;
+       boost::optional<std::string> key_type () const override;
+       std::string cpl_node_name (Standard standard) const override;
 };