X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=4e14802e8a9a7e5b0aee5e6703069338f1bbc0cd;hb=c98c87afe29d9ef74bdced8a9c96d7752f3fe80f;hp=86ce7503c9483c192e78c1655c99391f0ba68d36;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 86ce7503c..4e14802e8 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -268,8 +268,7 @@ FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
 ContentTime
 FFmpegContent::audio_length () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	if (!_audio_stream) {
+	if (!audio_stream ()) {
 		return ContentTime ();
 	}
 
@@ -450,7 +449,7 @@ void
 FFmpegContent::set_audio_mapping (AudioMapping m)
 {
 	audio_stream()->mapping = m;
-	signal_changed (AudioContentProperty::AUDIO_MAPPING);
+	AudioContent::set_audio_mapping (m);
 }
 
 string