diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
| commit | 59e769023c392c332331567a1aea94660002c463 (patch) | |
| tree | e68d918e3c48f470a688b8bb5bf95590fb9c4916 /src/wx/content_panel.cc | |
| parent | 5af65f61bf6eba06c24025d63b43aec896a00c9c (diff) | |
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calculation.
Diffstat (limited to 'src/wx/content_panel.cc')
| -rw-r--r-- | src/wx/content_panel.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 4d73a608d..8bcf46f5c 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -248,7 +248,7 @@ ContentPanel::add_file_clicked () /* XXX: check for lots of files here and do something */ for (unsigned int i = 0; i < paths.GetCount(); ++i) { - _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])), true); + _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); } d->Destroy (); @@ -281,7 +281,7 @@ ContentPanel::add_folder_clicked () if (is_dcp) { try { shared_ptr<DCPContent> content (new DCPContent (_film, path)); - _film->examine_and_add_content (content, true); + _film->examine_and_add_content (content); } catch (...) { error_dialog (_panel, _("Could not find a DCP in that folder.")); } @@ -290,7 +290,6 @@ ContentPanel::add_folder_clicked () ImageSequenceDialog* e = new ImageSequenceDialog (_panel); r = e->ShowModal (); float const frame_rate = e->frame_rate (); - bool const digest = e->digest (); e->Destroy (); if (r != wxID_OK) { @@ -302,7 +301,7 @@ ContentPanel::add_folder_clicked () try { shared_ptr<ImageContent> content (new ImageContent (_film, path)); content->set_video_frame_rate (frame_rate); - _film->examine_and_add_content (content, digest); + _film->examine_and_add_content (content); } catch (...) { error_dialog (_panel, _("Could not find any images in that folder")); return; @@ -491,6 +490,6 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) wxString* paths = event.GetFiles (); for (int i = 0; i < event.GetNumberOfFiles(); i++) { - _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])), true); + _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); } } |