ClairMeta points out that SMPTE subtitle MXF's ResourceID should

[libdcp.git] / src / reel_sound_asset.cc

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 49116575f5d51139b19064f407bc713ef347c97e..baacfe720ff77b29e4718938c3d19cbfc4aab98a 100644 (file)
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -16,6 +16,19 @@
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/reel_sound_asset.cc
@@ -47,7 +60,7 @@ ReelSoundAsset::ReelSoundAsset (shared_ptr<const cxml::Node> node)
 }
 
 string
-ReelSoundAsset::cpl_node_name () const
+ReelSoundAsset::cpl_node_name (Standard) const
 {
        return "MainSound";
 }
@@ -58,16 +71,16 @@ ReelSoundAsset::key_type () const
        return "MDAK";
 }
 
-void
+xmlpp::Node *
 ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {
-       ReelAsset::write_to_cpl (node, standard);
+       xmlpp::Node* asset = ReelAsset::write_to_cpl (node, standard);
 
         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().get ());
+               xmlpp::Node* hash = find_child (asset, "Hash");
+               asset->add_child_before(hash, "KeyId")->add_child_text("urn:uuid:" + key_id().get());
         }
+
+       return asset;
 }