Ref does not need to be a template since it's always used for Asset.

[libdcp.git] / src / reel_sound_asset.h

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index 42835c848f192652065db6f0b46368a184b68854..3158f8a06891b9c2ba8da665397e61619da9d243 100644 (file)
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,33 +21,38 @@
  *  @brief ReelSoundAsset class.
  */
 
+#include "reel_mxf.h"
 #include "reel_asset.h"
-#include "sound_mxf.h"
+#include "sound_asset.h"
 #include <boost/shared_ptr.hpp>
 #include <string>
 
 namespace dcp {
 
 /** @class ReelSoundAsset
- *  @brief Part of a Reel's description which refers to a sound MXF.
+ *  @brief Part of a Reel's description which refers to a sound asset.
  */
-class ReelSoundAsset : public ReelAsset
+class ReelSoundAsset : public ReelAsset, public ReelMXF
 {
 public:
-       ReelSoundAsset (boost::shared_ptr<Content> content, int64_t entry_point);
+       ReelSoundAsset (boost::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
        ReelSoundAsset (boost::shared_ptr<const cxml::Node>);
 
-       boost::shared_ptr<SoundMXF> mxf () {
-               return boost::dynamic_pointer_cast<SoundMXF> (_content.object ());
+       void write_to_cpl (xmlpp::Node* node, Standard standard) const;
+
+       /** @return the SoundAsset that this object refers to */
+       boost::shared_ptr<SoundAsset> asset () {
+               return boost::dynamic_pointer_cast<SoundAsset> (_asset_ref.asset ());
        }
 
-       boost::shared_ptr<const SoundMXF> mxf () const {
-               return boost::dynamic_pointer_cast<const SoundMXF> (_content.object ());
+       /** @return the SoundAsset that this object refers to */
+       boost::shared_ptr<const SoundAsset> asset () const {
+               return boost::dynamic_pointer_cast<const SoundAsset> (_asset_ref.asset ());
        }
-       
+
 private:
+       std::string key_type () const;
        std::string cpl_node_name () const;
 };
 
 }
-