UI tweaks for still image DCPs with audio.

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 1d8d12cd552bf3f7236243d489026359fb94b3d5..2a0d828e2153d4e418e8f254277f98f719a33754 100644 (file)
--- 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 58d1e50103285b2d0a47126a04c462a04bb2ac00..9da15a73baf31ffc36f27bbfa05f87e61ad4310a 100644 (file)
--- 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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index da48c26457a8499a32bb03da918346b5c1437de3..999ea8753f68bd45b9141bfc9a2c536da3b38e23 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -316,7 +316,7 @@ FilmEditor::make_audio_panel ()
        }
 
        _use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio"));
-       _audio_sizer->Add (video_control (_use_external_audio));
+       _audio_sizer->Add (_use_external_audio);
        _audio_sizer->AddSpacer (0);
 
        assert (MAX_AUDIO_CHANNELS == 6);
@@ -331,9 +331,9 @@ FilmEditor::make_audio_panel ()
        };
 
        for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               video_control (add_label_to_sizer (_audio_sizer, _audio_panel, channels[i]));
+               add_label_to_sizer (_audio_sizer, _audio_panel, channels[i]);
                _external_audio[i] = new wxFilePickerCtrl (_audio_panel, wxID_ANY, wxT (""), wxT ("Select Audio File"), wxT ("*.wav"));
-               _audio_sizer->Add (video_control (_external_audio[i]), 1, wxEXPAND);
+               _audio_sizer->Add (_external_audio[i], 1, wxEXPAND);
        }
 
        _audio_gain->SetRange (-60, 60);