X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=8bcf46f5c3151e2c0a2fe3f844e76483377833bc;hb=59e769023c392c332331567a1aea94660002c463;hp=4d73a608dcb2b329f7c262c95d2561f02b9265a9;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git 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 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 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]))); } }