projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index b3d28db5fcd823fa8918c70a18ffd98421d544b7..45c423355e3cc7578de2ef51a7d407045f94b1dc 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-72,7
+72,7
@@
using boost::lexical_cast;
/** @param f Film to edit */
FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
: wxPanel (parent)
/** @param f Film to edit */
FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
: wxPanel (parent)
- , _menu (
f,
this)
+ , _menu (this)
, _generally_sensitive (true)
, _timeline_dialog (0)
{
, _generally_sensitive (true)
, _timeline_dialog (0)
{
@@
-150,7
+150,11
@@
FilmEditor::make_dcp_panel ()
}
++r;
}
++r;
- _encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, wxT ("Encrypted"));
+ _signed = new wxCheckBox (_dcp_panel, wxID_ANY, _("Signed"));
+ grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2));
+ ++r;
+
+ _encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, _("Encrypted"));
grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
@@
-238,6
+242,7
@@
FilmEditor::connect_to_widgets ()
_dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::dcp_content_type_changed, this));
_frame_rate->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::frame_rate_changed, this));
_best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::best_frame_rate_clicked, this));
_dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::dcp_content_type_changed, this));
_frame_rate->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::frame_rate_changed, this));
_best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::best_frame_rate_clicked, this));
+ _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::signed_toggled, this));
_encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::encrypted_toggled, this));
_audio_channels->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::audio_channels_changed, this));
_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::j2k_bandwidth_changed, this));
_encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::encrypted_toggled, this));
_audio_channels->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::audio_channels_changed, this));
_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::j2k_bandwidth_changed, this));
@@
-270,16
+275,16
@@
FilmEditor::make_content_panel ()
b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT);
_content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT);
_content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
- _content_earlier = new wxButton (_content_panel, wxID_
UP
);
+ _content_earlier = new wxButton (_content_panel, wxID_
ANY, _("Up")
);
b->Add (_content_earlier, 1, wxEXPAND);
b->Add (_content_earlier, 1, wxEXPAND);
- _content_later = new wxButton (_content_panel, wxID_
DOWN
);
+ _content_later = new wxButton (_content_panel, wxID_
ANY, _("Down")
);
b->Add (_content_later, 1, wxEXPAND);
_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
s->Add (b, 0, wxALL, 4);
b->Add (_content_later, 1, wxEXPAND);
_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
s->Add (b, 0, wxALL, 4);
- _content_sizer->Add (s, 0
.75
, wxEXPAND | wxALL, 6);
+ _content_sizer->Add (s, 0, wxEXPAND | wxALL, 6);
}
_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
}
_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
@@
-319,6
+324,16
@@
FilmEditor::j2k_bandwidth_changed ()
_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
}
_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
}
+void
+FilmEditor::signed_toggled ()
+{
+ if (!_film) {
+ return;
+ }
+
+ _film->set_signed (_signed->GetValue ());
+}
+
void
FilmEditor::encrypted_toggled ()
{
void
FilmEditor::encrypted_toggled ()
{
@@
-416,8
+431,17
@@
FilmEditor::film_changed (Film::Property p)
case Film::SCALER:
checked_set (_scaler, Scaler::as_index (_film->scaler ()));
break;
case Film::SCALER:
checked_set (_scaler, Scaler::as_index (_film->scaler ()));
break;
+ case Film::SIGNED:
+ checked_set (_signed, _film->is_signed ());
+ break;
case Film::ENCRYPTED:
checked_set (_encrypted, _film->encrypted ());
case Film::ENCRYPTED:
checked_set (_encrypted, _film->encrypted ());
+ if (_film->encrypted ()) {
+ _film->set_signed (true);
+ _signed->Enable (false);
+ } else {
+ _signed->Enable (_generally_sensitive);
+ }
break;
case Film::RESOLUTION:
checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
break;
case Film::RESOLUTION:
checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
@@
-572,12
+596,12
@@
FilmEditor::set_film (shared_ptr<Film> f)
film_changed (Film::RESOLUTION);
film_changed (Film::SCALER);
film_changed (Film::WITH_SUBTITLES);
film_changed (Film::RESOLUTION);
film_changed (Film::SCALER);
film_changed (Film::WITH_SUBTITLES);
+ film_changed (Film::SIGNED);
film_changed (Film::ENCRYPTED);
film_changed (Film::J2K_BANDWIDTH);
film_changed (Film::DCI_METADATA);
film_changed (Film::VIDEO_FRAME_RATE);
film_changed (Film::AUDIO_CHANNELS);
film_changed (Film::ENCRYPTED);
film_changed (Film::J2K_BANDWIDTH);
film_changed (Film::DCI_METADATA);
film_changed (Film::VIDEO_FRAME_RATE);
film_changed (Film::AUDIO_CHANNELS);
- film_changed (Film::ENCRYPTED);
film_changed (Film::SEQUENCE_VIDEO);
film_changed (Film::THREE_D);
film_changed (Film::INTEROP);
film_changed (Film::SEQUENCE_VIDEO);
film_changed (Film::THREE_D);
film_changed (Film::INTEROP);
@@
-606,6
+630,13
@@
FilmEditor::set_general_sensitivity (bool s)
_content_later->Enable (s);
_content_timeline->Enable (s);
_dcp_content_type->Enable (s);
_content_later->Enable (s);
_content_timeline->Enable (s);
_dcp_content_type->Enable (s);
+
+ bool si = s;
+ if (_film && _film->encrypted ()) {
+ si = false;
+ }
+ _signed->Enable (si);
+
_encrypted->Enable (s);
_frame_rate->Enable (s);
_audio_channels->Enable (s);
_encrypted->Enable (s);
_frame_rate->Enable (s);
_audio_channels->Enable (s);
@@
-703,7
+734,7
@@
FilmEditor::setup_content ()
ContentList content = _film->content ();
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
int const t = _content->GetItemCount ();
ContentList content = _film->content ();
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
int const t = _content->GetItemCount ();
- bool const valid = (*i)->path_valid ();
+ bool const valid = (*i)->path
s
_valid ();
string s = (*i)->summary ();
if (!valid) {
string s = (*i)->summary ();
if (!valid) {
@@
-730,11
+761,14
@@
FilmEditor::setup_content ()
void
FilmEditor::content_add_file_clicked ()
{
void
FilmEditor::content_add_file_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
+ /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
+ non-Latin filenames or paths.
+ */
+ wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR);
int const r = d->ShowModal ();
int const r = d->ShowModal ();
- d->Destroy ();
if (r != wxID_OK) {
if (r != wxID_OK) {
+ d->Destroy ();
return;
}
return;
}
@@
-746,6
+780,8
@@
FilmEditor::content_add_file_clicked ()
for (unsigned int i = 0; i < paths.GetCount(); ++i) {
_film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])));
}
for (unsigned int i = 0; i < paths.GetCount(); ++i) {
_film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])));
}
+
+ d->Destroy ();
}
void
}
void
@@
-820,7
+856,9
@@
FilmEditor::selected_content ()
break;
}
break;
}
- sel.push_back (_film->content()[s]);
+ if (s < int (_film->content().size ())) {
+ sel.push_back (_film->content()[s]);
+ }
}
return sel;
}
return sel;
@@
-898,7
+936,7
@@
FilmEditor::content_timeline_clicked ()
_timeline_dialog = 0;
}
_timeline_dialog = 0;
}
- _timeline_dialog = new TimelineDialog (this, _film);
+ _timeline_dialog = new
DCP
TimelineDialog (this, _film);
_timeline_dialog->Show ();
}
_timeline_dialog->Show ();
}
@@
-928,7
+966,7
@@
FilmEditor::sequence_video_changed ()
void
FilmEditor::content_right_click (wxListEvent& ev)
{
void
FilmEditor::content_right_click (wxListEvent& ev)
{
- _menu.popup (selected_content (), ev.GetPoint ());
+ _menu.popup (
_film,
selected_content (), ev.GetPoint ());
}
void
}
void