Re-work again so that there's just one encoder; various tweaks to still-image-with...

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 999ea8753f68bd45b9141bfc9a2c536da3b38e23..c3f71917254e197828adcb76f29196d81b9d644a 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);
@@ -725,6 +725,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);
@@ -846,6 +847,15 @@ FilmEditor::setup_visibility ()
        }
 
        _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 ();
 }
 
 void
@@ -1001,6 +1011,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 ())));
        }