In-line run of subs_in_out so that it gets the environment more easily.

[libdcp.git] / src / reel_sound_asset.h

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index 0b4d0f9d2e9fed5d12b7aa6a42c86b7a96e465b4..16d629d1105d3c7e03fab429fd7b6622f6d4ec6b 100644 (file)
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -55,21 +55,21 @@ public:
        ReelSoundAsset (std::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
        explicit ReelSoundAsset (std::shared_ptr<const cxml::Node>);
 
-       bool equals (std::shared_ptr<const ReelSoundAsset>, EqualityOptions, NoteHandler) const;
+       /** @return the SoundAsset that this object refers to */
+       std::shared_ptr<const SoundAsset> asset () const {
+               return asset_of_type<const SoundAsset>();
+       }
 
        /** @return the SoundAsset that this object refers to */
        std::shared_ptr<SoundAsset> asset () {
                return asset_of_type<SoundAsset>();
        }
 
-       /** @return the SoundAsset that this object refers to */
-       std::shared_ptr<const SoundAsset> asset () const {
-               return asset_of_type<const SoundAsset>();
-       }
+       bool equals(std::shared_ptr<const ReelSoundAsset>, EqualityOptions const&, NoteHandler) const;
 
 private:
-       boost::optional<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;
 };