, _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);
_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);
_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);
_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 &)
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:
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 ()));
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);
_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);
(*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
}
_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
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 ())));
}
_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 ()));
}
}