diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-19 21:06:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-19 21:06:35 +0000 |
| commit | 13337c62d8c0d052ba0377af9c00fe1d940be3cc (patch) | |
| tree | f63433aaac650d144d8b17c01ac9047b167b50a3 | |
| parent | 54a9c84e2b4d69b1e6ed669400f84b1604cc2369 (diff) | |
UI tweaks for still image DCPs with audio.
| -rw-r--r-- | src/lib/decoder_factory.cc | 2 | ||||
| -rw-r--r-- | src/lib/film.cc | 5 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 6 |
3 files changed, 9 insertions, 4 deletions
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 diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index da48c2645..999ea8753 100644 --- 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); |