projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
audio_content.cc
diff --git
a/src/lib/audio_content.cc
b/src/lib/audio_content.cc
index e8fd4bbd39d0e93813bd78b325624307e60e4750..03bfe9630a9cb304de9d23c54456c7cf432c1fcc 100644
(file)
--- a/
src/lib/audio_content.cc
+++ b/
src/lib/audio_content.cc
@@
-29,6
+29,7
@@
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
+using std::cout;
using std::vector;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using std::vector;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
@@
-57,7
+58,7
@@
AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
}
}
-AudioContent::AudioContent (shared_ptr<const Film> f,
shared_ptr<const cxml::Node>
node)
+AudioContent::AudioContent (shared_ptr<const Film> f,
cxml::ConstNodePtr
node)
: Content (f, node)
{
_audio_gain = node->number_child<float> ("AudioGain");
: Content (f, node)
{
_audio_gain = node->number_child<float> ("AudioGain");
@@
-139,7
+140,7
@@
AudioContent::audio_analysis_path () const
}
boost::filesystem::path p = film->audio_analysis_dir ();
}
boost::filesystem::path p = film->audio_analysis_dir ();
- p /= digest
();
+ p /= digest
() + "_" + audio_mapping().digest
();
return p;
}
return p;
}