X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=0b2700d283376721dffa22b213fc1651658db0ff;hb=2ed96cf8baea81ab3b6331ae029bfa76ef2522e1;hp=53ed9879977d5e11fab362a7cb94b9b88fe8d7a6;hpb=9c260edf726e0118741c9115b59c7903b25e4a1f;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 53ed98799..0b2700d28 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,6 @@ */ -#include -#include -#include #include "lib/audio_content.h" #include "lib/subtitle_content.h" #include "lib/video_content.h" @@ -35,10 +32,18 @@ #include "subtitle_panel.h" #include "timing_panel.h" #include "timeline_dialog.h" +#include "image_sequence_dialog.h" +#include +#include +#include +#include + +#include "lib/image_filename_sorter.cc" using std::list; using std::string; using std::cout; +using std::vector; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; @@ -58,6 +63,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr f) wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _content = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); + _content->DragAcceptFiles (true); s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); _content->InsertColumn (0, wxT("")); @@ -69,8 +75,8 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr f) _add_file->SetToolTip (_("Add video, image or sound files to the film.")); b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _add_folder = new wxButton (_panel, wxID_ANY, _("Add image\nsequence...")); - _add_folder->SetToolTip (_("Add a directory of image files which will be used as a moving image sequence.")); + _add_folder = new wxButton (_panel, wxID_ANY, _("Add folder...")); + _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a DCP.")); b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _remove = new wxButton (_panel, wxID_ANY, _("Remove")); @@ -243,12 +249,11 @@ ContentPanel::add_file_clicked () wxArrayString paths; d->GetPaths (paths); - - /* XXX: check for lots of files here and do something */ - + list path_list; for (unsigned int i = 0; i < paths.GetCount(); ++i) { - _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); + path_list.push_back (wx_to_std (paths[i])); } + add_files (path_list); d->Destroy (); } @@ -257,28 +262,54 @@ void ContentPanel::add_folder_clicked () { wxDirDialog* d = new wxDirDialog (_panel, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); - int const r = d->ShowModal (); + int r = d->ShowModal (); + boost::filesystem::path const path (wx_to_std (d->GetPath ())); d->Destroy (); if (r != wxID_OK) { return; } - shared_ptr content; - - try { - content.reset (new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))); - } catch (...) { + /* Guess if this is a DCP or a set of images: read the first ten filenames and if they + are all valid image files we assume it is a set of images. + */ + + bool is_dcp = false; + int read = 0; + for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i, ++read) { + if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) { + is_dcp = true; + } + } + + if (is_dcp) { try { - content.reset (new DCPContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))); + shared_ptr content (new DCPContent (_film, path)); + _film->examine_and_add_content (content); } catch (...) { - error_dialog (_panel, _("Could not find any images nor a DCP in that folder")); + error_dialog (_panel, _("Could not find a DCP nor a set of images in that folder.")); + } + } else { + + ImageSequenceDialog* e = new ImageSequenceDialog (_panel); + r = e->ShowModal (); + float const frame_rate = e->frame_rate (); + e->Destroy (); + + if (r != wxID_OK) { return; } - } - if (content) { - _film->examine_and_add_content (content); + shared_ptr content; + + try { + shared_ptr content (new ImageContent (_film, path)); + content->set_video_frame_rate (frame_rate); + _film->examine_and_add_content (content); + } catch (...) { + error_dialog (_panel, _("Could not find any images in that folder")); + return; + } } } @@ -308,7 +339,7 @@ ContentPanel::timeline_clicked () void ContentPanel::right_click (wxListEvent& ev) { - _menu->popup (_film, selected (), ev.GetPoint ()); + _menu->popup (_film, selected (), TimelineContentViewList (), ev.GetPoint ()); } /** Set up broad sensitivity based on the type of content that is selected */ @@ -410,6 +441,36 @@ ContentPanel::film_content_changed (int property) void ContentPanel::setup () { + ContentList content = _film->content (); + sort (content.begin(), content.end(), ContentSorter ()); + + /* First, check to see if anything has changed and bail if not; this avoids + flickering on OS X. + */ + + vector existing; + for (int i = 0; i < _content->GetItemCount(); ++i) { + existing.push_back (wx_to_std (_content->GetItemText (i))); + } + + vector proposed; + for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { + bool const valid = (*i)->paths_valid (); + + string s = (*i)->summary (); + if (!valid) { + s = _("MISSING: ") + s; + } + + proposed.push_back (s); + } + + if (existing == proposed) { + return; + } + + /* Something has changed: set up the control */ + string selected_summary; int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (s != -1) { @@ -418,9 +479,6 @@ ContentPanel::setup () _content->DeleteAllItems (); - ContentList content = _film->content (); - sort (content.begin(), content.end(), ContentSorter ()); - for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { int const t = _content->GetItemCount (); bool const valid = (*i)->paths_valid (); @@ -462,7 +520,31 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) } wxString* paths = event.GetFiles (); + list path_list; for (int i = 0; i < event.GetNumberOfFiles(); i++) { - _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); + path_list.push_back (wx_to_std (paths[i])); + } + + add_files (path_list); +} + +void +ContentPanel::add_files (list paths) +{ + /* It has been reported that the paths returned from e.g. wxFileDialog are not always sorted; + I can't reproduce that, but sort them anyway. + */ + + paths.sort (ImageFilenameSorter ()); + + /* XXX: check for lots of files here and do something */ + + for (list::const_iterator i = paths.begin(); i != paths.end(); ++i) { + shared_ptr c = content_factory (_film, *i); + shared_ptr ic = dynamic_pointer_cast (c); + if (ic) { + ic->set_video_frame_rate (24); + } + _film->examine_and_add_content (c); } }