diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-16 12:32:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-16 12:32:04 +0100 |
| commit | 308488324dbc4d8b709d3fb1dc9fee0479346c21 (patch) | |
| tree | 446989a0bea3db683e5200da89c955140b175682 /src/lib/audio_content.cc | |
| parent | cfdd68eb5fb0ef8423e860103ad4e5510994f1da (diff) | |
| parent | 362ed9ee4f73bee21b3ef8d3b449bb8e8877f501 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/audio_content.cc')
| -rw-r--r-- | src/lib/audio_content.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index d9e00ff14..e8fd4bbd3 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -18,6 +18,7 @@ */ #include <libcxml/cxml.h> +#include <dcp/raw_convert.h> #include "audio_content.h" #include "analyse_audio_job.h" #include "job_manager.h" @@ -30,8 +31,8 @@ using std::string; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using dcp::raw_convert; int const AudioContentProperty::AUDIO_CHANNELS = 200; int const AudioContentProperty::AUDIO_LENGTH = 201; @@ -59,8 +60,6 @@ AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p) AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node) : Content (f, node) { - LocaleGuard lg; - _audio_gain = node->number_child<float> ("AudioGain"); _audio_delay = node->number_child<int> ("AudioDelay"); } @@ -90,11 +89,9 @@ AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> void AudioContent::as_xml (xmlpp::Node* node) const { - LocaleGuard lg; - boost::mutex::scoped_lock lm (_mutex); - node->add_child("AudioGain")->add_child_text (lexical_cast<string> (_audio_gain)); - node->add_child("AudioDelay")->add_child_text (lexical_cast<string> (_audio_delay)); + node->add_child("AudioGain")->add_child_text (raw_convert<string> (_audio_gain)); + node->add_child("AudioDelay")->add_child_text (raw_convert<string> (_audio_delay)); } |