From 13337c62d8c0d052ba0377af9c00fe1d940be3cc Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 19 Dec 2012 21:06:35 +0000
Subject: UI tweaks for still image DCPs with audio.

---
 src/lib/decoder_factory.cc | 2 +-
 src/lib/film.cc            | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 1d8d12cd5..2a0d828e2 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -43,7 +43,7 @@ decoder_factory (
 		/* A single image file, or a directory of them */
 		return Decoders (
 			shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o, j)),
-			shared_ptr<AudioDecoder> ()
+			shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j))
 			);
 	}
 
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 58d1e5010..9da15a73b 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -900,6 +900,11 @@ Film::set_content (string c)
 		set_format (Format::from_id ("185"));
 		break;
 	}
+
+	/* Still image DCPs must use external audio */
+	if (content_type() == STILL) {
+		set_use_content_audio (false);
+	}
 }
 
 void
-- 
cgit v1.2.3