diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-03 13:17:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-03 13:17:37 +0100 |
| commit | fa61fc99549264810e17fcd35abffe9e8ddab5b2 (patch) | |
| tree | 855ce952ed8b416bbab33cd6debbd0f2b7379597 /src/lib/single_stream_audio_content.cc | |
| parent | 3b67c79bf4534e72a7eceaa6e566e7b7c949e4f7 (diff) | |
Various work on audio mapping.
Fix everything up so that the audio mapping view in
the audio panel reflects the processor (or lack of).
Diffstat (limited to 'src/lib/single_stream_audio_content.cc')
| -rw-r--r-- | src/lib/single_stream_audio_content.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/single_stream_audio_content.cc b/src/lib/single_stream_audio_content.cc index a38ef0e1e..f978fa423 100644 --- a/src/lib/single_stream_audio_content.cc +++ b/src/lib/single_stream_audio_content.cc @@ -60,11 +60,14 @@ SingleStreamAudioContent::as_xml (xmlpp::Node* node) const void SingleStreamAudioContent::take_from_audio_examiner (shared_ptr<AudioExaminer> examiner) { + shared_ptr<const Film> film = _film.lock (); + DCPOMATIC_ASSERT (film); + { boost::mutex::scoped_lock lm (_mutex); _audio_stream.reset (new AudioStream (examiner->audio_frame_rate(), examiner->audio_channels ())); AudioMapping m = _audio_stream->mapping (); - m.make_default (); + film->make_audio_mapping_default (m); _audio_stream->set_mapping (m); } |