Merge branch 'master' of /home/carl/git/dvdomatic

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index d2caa0dea77a9caae3c39cdd160abeaef98c4c9a..20dbc88ef1f5f404cc2b1648c4b033be8165ca28 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -104,7 +104,7 @@ FilmEditor::make_film_panel ()
        
        add_label_to_grid_bag_sizer (grid, _film_panel, _("Name"), wxGBPosition (r, 0));
        _name = new wxTextCtrl (_film_panel, wxID_ANY);
-       grid->Add (_name, wxGBPosition(r, 1));
+       grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
        ++r;
        
        add_label_to_grid_bag_sizer (grid, _film_panel, _("DCP Name"), wxGBPosition (r, 0));
@@ -149,7 +149,7 @@ FilmEditor::make_film_panel ()
        }
        ++r;
 
-       _frame_rate_description = new wxStaticText (_film_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize);
+       _frame_rate_description = new wxStaticText (_film_panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize);
        grid->Add (video_control (_frame_rate_description), wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
        wxFont font = _frame_rate_description->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);
@@ -617,6 +617,7 @@ FilmEditor::film_changed (Film::Property p)
                setup_formats ();
                setup_subtitle_control_sensitivity ();
                setup_streams ();
+               setup_show_audio_sensitivity ();
                break;
        case Film::TRUST_CONTENT_HEADER:
                checked_set (_trust_content_header, _film->trust_content_header ());
@@ -627,6 +628,7 @@ FilmEditor::film_changed (Film::Property p)
                break;
        case Film::CONTENT_AUDIO_STREAMS:
                setup_streams ();
+               setup_show_audio_sensitivity ();
                break;
        case Film::FORMAT:
        {
@@ -696,8 +698,6 @@ FilmEditor::film_changed (Film::Property p)
                        _trim_end->SetRange (0, _film->length().get());
                }
                break;
-       case Film::DCP_INTRINSIC_DURATION:
-               break;
        case Film::DCP_CONTENT_TYPE:
                checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
                setup_dcp_name ();
@@ -754,6 +754,7 @@ FilmEditor::film_changed (Film::Property p)
                setup_dcp_name ();
                setup_audio_details ();
                setup_audio_control_sensitivity ();
+               setup_show_audio_sensitivity ();
                break;
        case Film::USE_CONTENT_AUDIO:
                checked_set (_use_content_audio, _film->use_content_audio());
@@ -761,6 +762,7 @@ FilmEditor::film_changed (Film::Property p)
                setup_dcp_name ();
                setup_audio_details ();
                setup_audio_control_sensitivity ();
+               setup_show_audio_sensitivity ();
                break;
        case Film::SUBTITLE_STREAM:
                if (_film->subtitle_stream()) {
@@ -774,6 +776,7 @@ FilmEditor::film_changed (Film::Property p)
                        checked_set (_external_audio[i], a[i]);
                }
                setup_audio_details ();
+               setup_show_audio_sensitivity ();
                break;
        }
        case Film::DCP_FRAME_RATE:
@@ -915,6 +918,7 @@ FilmEditor::set_things_sensitive (bool s)
 
        setup_subtitle_control_sensitivity ();
        setup_audio_control_sensitivity ();
+       setup_show_audio_sensitivity ();
 }
 
 /** Called when the `Edit filters' button has been clicked */
@@ -1123,7 +1127,7 @@ FilmEditor::setup_subtitle_control_sensitivity ()
 void
 FilmEditor::setup_audio_control_sensitivity ()
 {
-       _use_content_audio->Enable (_generally_sensitive);
+       _use_content_audio->Enable (_generally_sensitive && _film && !_film->content_audio_streams().empty());
        _use_external_audio->Enable (_generally_sensitive);
        
        bool const source = _generally_sensitive && _use_content_audio->GetValue();
@@ -1218,7 +1222,7 @@ FilmEditor::subtitle_stream_changed (wxCommandEvent &)
 void
 FilmEditor::setup_audio_details ()
 {
-       if (!_film->audio_stream()) {
+       if (!_film->content_audio_stream()) {
                _audio->SetLabel (wxT (""));
        } else {
                stringstream s;
@@ -1289,3 +1293,9 @@ FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &)
        
        _film->set_dcp_frame_rate (best_dcp_frame_rate (_film->source_frame_rate ()));
 }
+
+void
+FilmEditor::setup_show_audio_sensitivity ()
+{
+       _show_audio->Enable (_film && _film->has_audio ());
+}