Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 999ea8753f68bd45b9141bfc9a2c536da3b38e23..8cf8c5fda9e7ebf84a88d9ac0676d379a1f8bf77 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);
@@ -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,9 @@ FilmEditor::setup_subtitle_control_sensitivity ()
        }
        
        _with_subtitles->Enable (h);
-       _subtitle_stream->Enable (h);
-       _subtitle_offset->Enable (h);
-       _subtitle_scale->Enable (h);
+       _subtitle_stream->Enable (_film->with_subtitles ());
+       _subtitle_offset->Enable (_film->with_subtitles ());
+       _subtitle_scale->Enable (_film->with_subtitles ());
 }
 
 void
@@ -1001,6 +1012,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 ())));
        }