UI tweaks for still image DCPs with audio.

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 0243c6afc9e368ca0c3df2463d0002577252e463..999ea8753f68bd45b9141bfc9a2c536da3b38e23 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -219,9 +219,9 @@ FilmEditor::make_video_panel ()
        pad->Add (_video_sizer, 0, wxALL, 8);
        _video_panel->SetSizer (pad);
 
-       video_control (add_label_to_sizer (_video_sizer, _video_panel, "Format"));
+       add_label_to_sizer (_video_sizer, _video_panel, "Format");
        _format = new wxComboBox (_video_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);
-       _video_sizer->Add (video_control (_format));
+       _video_sizer->Add (_format);
 
        {
                add_label_to_sizer (_video_sizer, _video_panel, "Crop");
@@ -269,7 +269,7 @@ FilmEditor::make_video_panel ()
        _top_crop->SetRange (0, 1024);
        _right_crop->SetRange (0, 1024);
        _bottom_crop->SetRange (0, 1024);
-       _still_duration->SetRange (0, 60 * 60);
+       _still_duration->SetRange (1, 60 * 60);
        _dcp_trim_start->SetRange (0, 100);
        _dcp_trim_end->SetRange (0, 100);
 }
@@ -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);