Fix copy and paste error in previous commit.

[libdcp.git] / src / reel_sound_asset.cc

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 9d3e00d76ef5b6926709bc85008a77a41e7daf02..165453ced012a15a95bb5dcfaa20e0f61c19a00d 100644 (file)
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -24,19 +24,22 @@
 #include "reel_sound_asset.h"
 #include "dcp_assert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 using std::string;
 using boost::shared_ptr;
 using namespace dcp;
 
-ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundMXF> asset, int64_t entry_point)
-       : ReelMXFAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundAsset> asset, int64_t entry_point)
+       : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+       , ReelMXF (asset->key_id())
 {
 
 }
 
 ReelSoundAsset::ReelSoundAsset (shared_ptr<const cxml::Node> node)
-       : ReelMXFAsset (node)
+       : ReelAsset (node)
+       , ReelMXF (node)
 {
        node->ignore_child ("Language");
        node->done ();
@@ -59,11 +62,11 @@ ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
        ReelAsset::write_to_cpl (node, standard);
 
-        if (!key_id ().empty ()) {
+        if (key_id ()) {
                /* Find <MainSound> */
                xmlpp::Node* ms = find_child (node, cpl_node_name ());
                /* Find <Hash> */
                xmlpp::Node* hash = find_child (ms, "Hash");
-               ms->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id ());
+               ms->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id().get ());
         }
 }