Add some explicit declarations to constructors.

[libdcp.git] / src / reel_sound_asset.h

diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index d7eee59d8301f96ef6219b06ba9aea1c0a3699c8..a2716a5186bfe6f237997571195857a4dfcf2fcb 100644 (file)
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -1,27 +1,28 @@
 /*
-    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
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /** @file  src/reel_sound_asset.h
  *  @brief ReelSoundAsset class.
  */
 
-#include "reel_mxf_asset.h"
+#include "reel_mxf.h"
+#include "reel_asset.h"
 #include "sound_asset.h"
 #include <boost/shared_ptr.hpp>
 #include <string>
@@ -29,30 +30,29 @@
 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 ReelMXFAsset
+class ReelSoundAsset : public ReelAsset, public ReelMXF
 {
 public:
        ReelSoundAsset (boost::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
-       ReelSoundAsset (boost::shared_ptr<const cxml::Node>);
+       explicit ReelSoundAsset (boost::shared_ptr<const cxml::Node>);
 
        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.object ());
+               return asset_of_type<SoundAsset> ();
        }
 
        /** @return the SoundAsset that this object refers to */
        boost::shared_ptr<const SoundAsset> asset () const {
-               return boost::dynamic_pointer_cast<const SoundAsset> (_asset_ref.object ());
+               return asset_of_type<const SoundAsset> ();
        }
-       
+
 private:
        std::string key_type () const;
        std::string cpl_node_name () const;
 };
 
 }
-