From 51fcb7e0f42b385f569f10f93c29f5a1f2802d82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Apr 2013 20:52:47 +0100 Subject: Use content digest for audio maps, not file name. --- src/lib/audio_mapping.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 2e8077565..83c748f1a 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -94,7 +94,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const for (list >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) { xmlpp::Node* t = node->add_child ("Map"); shared_ptr c = i->first.content.lock (); - t->add_child ("Content")->add_child_text (c->file().string ()); + t->add_child ("Content")->add_child_text (c->digest ()); t->add_child ("ContentIndex")->add_child_text (lexical_cast (i->first.index)); t->add_child ("DCP")->add_child_text (lexical_cast (i->second)); } @@ -107,7 +107,7 @@ AudioMapping::set_from_xml (ContentList const & content, shared_ptr >::const_iterator i = c.begin(); i != c.end(); ++i) { string const c = (*i)->string_child ("Content"); ContentList::const_iterator j = content.begin (); - while (j != content.end() && (*j)->file().string() != c) { + while (j != content.end() && (*j)->digest() != c) { ++j; } -- cgit v1.2.3