Merge master.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 1e592e268d5093422688ab53fdd49c31cff3b479..ea6055c94be1a95b611211bad91e0a03e3a213e5 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);
@@ -139,16 +139,20 @@ FilmEditor::make_film_panel ()
        {
                video_control (add_label_to_sizer (_film_sizer, _film_panel, "Trim frames"));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               add_label_to_sizer (s, _film_panel, "Start");
+               video_control (add_label_to_sizer (s, _film_panel, "Start"));
                _dcp_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_dcp_trim_start);
-               add_label_to_sizer (s, _film_panel, "End");
+               s->Add (video_control (_dcp_trim_start));
+               video_control (add_label_to_sizer (s, _film_panel, "End"));
                _dcp_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (_dcp_trim_end);
+               s->Add (video_control (_dcp_trim_end));
 
                _film_sizer->Add (s);
        }
 
+       _encrypted = new wxCheckBox (_film_panel, wxID_ANY, wxT ("Encrypted"));
+       _film_sizer->Add (_encrypted, 1);
+       _film_sizer->AddSpacer (0);
+
        _dcp_ab = new wxCheckBox (_film_panel, wxID_ANY, wxT ("A/B"));
        video_control (_dcp_ab);
        _film_sizer->Add (_dcp_ab, 1);
@@ -188,6 +192,7 @@ FilmEditor::connect_to_widgets ()
        _scaler->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
        _dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
        _dcp_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
+       _encrypted->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::encrypted_toggled), 0, this);
        _still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this);
        _dcp_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_start_changed), 0, this);
        _dcp_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_end_changed), 0, this);
@@ -269,7 +274,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 +321,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);
@@ -333,7 +338,7 @@ FilmEditor::make_audio_panel ()
        for (int i = 0; i < MAX_AUDIO_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);
@@ -354,7 +359,7 @@ FilmEditor::make_subtitle_panel ()
        _subtitle_sizer->Add (_with_subtitles, 1);
        
        _subtitle_stream = new wxComboBox (_subtitle_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY);
-       _subtitle_sizer->Add (_subtitle_stream);
+       _subtitle_sizer->Add (video_control (_subtitle_stream));
 
        video_control (add_label_to_sizer (_subtitle_sizer, _subtitle_panel, "Subtitle Offset"));
        _subtitle_offset = new wxSpinCtrl (_subtitle_panel);
@@ -454,6 +459,16 @@ FilmEditor::dcp_ab_toggled (wxCommandEvent &)
        _film->set_dcp_ab (_dcp_ab->GetValue ());
 }
 
+void
+FilmEditor::encrypted_toggled (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->set_encrypted (_encrypted->GetValue ());
+}
+                              
 /** Called when the name widget has been changed */
 void
 FilmEditor::name_changed (wxCommandEvent &)
@@ -588,8 +603,6 @@ FilmEditor::film_changed (Film::Property p)
                checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
                _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
                break;
-       case Film::THUMBS:
-               break;
        case Film::DCP_AB:
                checked_set (_dcp_ab, _film->dcp_ab ());
                break;
@@ -613,9 +626,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:
@@ -624,6 +635,9 @@ FilmEditor::film_changed (Film::Property p)
        case Film::SUBTITLE_SCALE:
                checked_set (_subtitle_scale, _film->subtitle_scale() * 100);
                break;
+       case Film::ENCRYPTED:
+               checked_set (_encrypted, _film->encrypted ());
+               break;
        case Film::USE_DCI_NAME:
                checked_set (_use_dci_name, _film->use_dci_name ());
                _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
@@ -727,9 +741,11 @@ 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);
+       film_changed (Film::ENCRYPTED);
        film_changed (Film::DCI_METADATA);
        film_changed (Film::SIZE);
        film_changed (Film::LENGTH);
@@ -763,6 +779,7 @@ FilmEditor::set_things_sensitive (bool s)
        _dcp_trim_start->Enable (s);
        _dcp_trim_end->Enable (s);
        _dcp_ab->Enable (s);
+       _encrypted->Enable (s);
        _audio_gain->Enable (s);
        _audio_gain_calculate_button->Enable (s);
        _audio_delay->Enable (s);
@@ -847,7 +864,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
@@ -954,9 +983,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
@@ -1003,6 +1038,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 ())));
        }
        
@@ -1059,7 +1095,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 ()));
        }
 }