diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-14 16:11:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-14 16:11:29 +0100 |
| commit | 5352daa4fa25f2ec3353ace953d23d9cb09f3549 (patch) | |
| tree | 56d44e07e84ff5d689097b5b2829e9bd697702d9 /src/lib/sndfile_content.cc | |
| parent | a5a64cf04a5b87296abd2a04306a907767f02e56 (diff) | |
Tidy up content mutexes slightly.
Diffstat (limited to 'src/lib/sndfile_content.cc')
| -rw-r--r-- | src/lib/sndfile_content.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index 7d09f715c..d57cf04e3 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -117,9 +117,13 @@ SndfileContent::examine (shared_ptr<Job> job) signal_changed (AudioContentProperty::AUDIO_LENGTH); signal_changed (AudioContentProperty::AUDIO_FRAME_RATE); - /* XXX: do this in signal_changed...? */ - _audio_mapping = AudioMapping (_audio_channels); - _audio_mapping.make_default (); + { + boost::mutex::scoped_lock lm (_mutex); + /* XXX: do this in signal_changed...? */ + _audio_mapping = AudioMapping (_audio_channels); + _audio_mapping.make_default (); + } + signal_changed (AudioContentProperty::AUDIO_MAPPING); } @@ -129,9 +133,10 @@ SndfileContent::as_xml (xmlpp::Node* node) const node->add_child("Type")->add_child_text ("Sndfile"); Content::as_xml (node); AudioContent::as_xml (node); - node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels)); - node->add_child("AudioLength")->add_child_text (lexical_cast<string> (_audio_length)); - node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate)); + + node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (audio_channels ())); + node->add_child("AudioLength")->add_child_text (lexical_cast<string> (audio_length ())); + node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ())); _audio_mapping.as_xml (node->add_child("AudioMapping")); } |