Fix 3D support.

[dcpomatic.git] / src / lib / ffmpeg_content.cc

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 86ce7503c9483c192e78c1655c99391f0ba68d36..4e14802e8a9a7e5b0aee5e6703069338f1bbc0cd 100644 (file)
--- 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