Try to fix plural on audio channels.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 4e7296a7ec488dbd97dc9ad94c46166d95ab6c95..dece245689b84d1092265c652da51e11c046280f 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -63,7 +63,7 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
        , _film (f)
        , _generally_sensitive (true)
 {
-       wxSizer* s = new wxBoxSizer (wxVERTICAL);
+       wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
        SetSizer (s);
        _notebook = new wxNotebook (this, wxID_ANY);
        s->Add (_notebook, 1);
@@ -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);
@@ -611,9 +611,7 @@ FilmEditor::film_changed (Film::Property p)
                break;
        case Film::WITH_SUBTITLES:
                checked_set (_with_subtitles, _film->with_subtitles ());
-               _subtitle_stream->Enable (_film->with_subtitles ());
-               _subtitle_scale->Enable (_film->with_subtitles ());
-               _subtitle_offset->Enable (_film->with_subtitles ());
+               setup_subtitle_control_sensitivity ();
                _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
                break;
        case Film::SUBTITLE_OFFSET:
@@ -725,6 +723,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
        film_changed (Film::USE_CONTENT_AUDIO);
        film_changed (Film::AUDIO_GAIN);
        film_changed (Film::AUDIO_DELAY);
+       film_changed (Film::STILL_DURATION);
        film_changed (Film::WITH_SUBTITLES);
        film_changed (Film::SUBTITLE_OFFSET);
        film_changed (Film::SUBTITLE_SCALE);
@@ -845,7 +844,19 @@ FilmEditor::setup_visibility ()
                (*i)->Show (c == STILL);
        }
 
+       _notebook->InvalidateBestSize ();
+       
        _film_sizer->Layout ();
+       _film_sizer->SetSizeHints (_film_panel);
+       _video_sizer->Layout ();
+       _video_sizer->SetSizeHints (_video_panel);
+       _audio_sizer->Layout ();
+       _audio_sizer->SetSizeHints (_audio_panel);
+       _subtitle_sizer->Layout ();
+       _subtitle_sizer->SetSizeHints (_subtitle_panel);
+
+       _notebook->Fit ();
+       Fit ();
 }
 
 void
@@ -952,9 +963,15 @@ FilmEditor::setup_subtitle_control_sensitivity ()
        }
        
        _with_subtitles->Enable (h);
-       _subtitle_stream->Enable (h);
-       _subtitle_offset->Enable (h);
-       _subtitle_scale->Enable (h);
+
+       bool j = false;
+       if (_film) {
+               j = _film->with_subtitles ();
+       }
+       
+       _subtitle_stream->Enable (j);
+       _subtitle_offset->Enable (j);
+       _subtitle_scale->Enable (j);
 }
 
 void
@@ -1001,6 +1018,7 @@ FilmEditor::setup_streams ()
        vector<shared_ptr<AudioStream> > a = _film->content_audio_streams ();
        for (vector<shared_ptr<AudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
                shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (*i);
+               assert (ffa);
                _audio_stream->Append (std_to_wx (ffa->name()), new wxStringClientData (std_to_wx (ffa->to_string ())));
        }
        
@@ -1057,7 +1075,12 @@ FilmEditor::setup_audio_details ()
                _audio->SetLabel (wxT (""));
        } else {
                stringstream s;
-               s << _film->audio_stream()->channels () << " channels, " << _film->audio_stream()->sample_rate() << "Hz";
+               if (_film->audio_stream()->channels() == 1) {
+                       s << "1 channel";
+               } else {
+                       s << _film->audio_stream()->channels () << " channels";
+               }
+               s << ", " << _film->audio_stream()->sample_rate() << "Hz";
                _audio->SetLabel (std_to_wx (s.str ()));
        }
 }