X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=2552f50987c8136c125239674807a5ff1c1150c9;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=2932ee7c58bca7cd6da585f47b7fb5bb435f6a63;hpb=996fa2194581bf95113b9778849654893c414889;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 2932ee7c5..2552f5098 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,14 @@ */ -#include -#include -#include +#include "content_panel.h" +#include "wx_util.h" +#include "video_panel.h" +#include "audio_panel.h" +#include "subtitle_panel.h" +#include "timing_panel.h" +#include "timeline_dialog.h" +#include "image_sequence_dialog.h" #include "lib/audio_content.h" #include "lib/subtitle_content.h" #include "lib/video_content.h" @@ -28,24 +33,27 @@ #include "lib/image_content.h" #include "lib/dcp_content.h" #include "lib/playlist.h" -#include "content_panel.h" -#include "wx_util.h" -#include "video_panel.h" -#include "audio_panel.h" -#include "subtitle_panel.h" -#include "timing_panel.h" -#include "timeline_dialog.h" +#include +#include +#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; -ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr f) +ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmViewer* viewer) : _timeline_dialog (0) - , _film (f) + , _parent (n) + , _film (film) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -56,35 +64,36 @@ 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("")); _content->SetColumnWidth (0, 512); wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); - + _add_file = new wxButton (_panel, wxID_ANY, _("Add file(s)...")); _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 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")); _remove->SetToolTip (_("Remove the selected piece of content from the film.")); b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - + _earlier = new wxButton (_panel, wxID_ANY, _("Up")); _earlier->SetToolTip (_("Move the selected piece of content earlier in the film.")); b->Add (_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - + _later = new wxButton (_panel, wxID_ANY, _("Down")); _later->SetToolTip (_("Move the selected piece of content later in the film.")); b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - + _timeline = new wxButton (_panel, wxID_ANY, _("Timeline...")); _timeline->SetToolTip (_("Open the timeline for the film.")); b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); @@ -103,7 +112,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr f) _panels.push_back (_audio_panel); _subtitle_panel = new SubtitlePanel (this); _panels.push_back (_subtitle_panel); - _timing_panel = new TimingPanel (this); + _timing_panel = new TimingPanel (this, viewer); _panels.push_back (_timing_panel); _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); @@ -140,11 +149,10 @@ ContentPanel::selected () VideoContentList ContentPanel::selected_video () { - ContentList c = selected (); VideoContentList vc; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); + + BOOST_FOREACH (shared_ptr i, selected ()) { + shared_ptr t = dynamic_pointer_cast (i); if (t) { vc.push_back (t); } @@ -156,11 +164,10 @@ ContentPanel::selected_video () AudioContentList ContentPanel::selected_audio () { - ContentList c = selected (); AudioContentList ac; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); + + BOOST_FOREACH (shared_ptr i, selected ()) { + shared_ptr t = dynamic_pointer_cast (i); if (t) { ac.push_back (t); } @@ -172,11 +179,10 @@ ContentPanel::selected_audio () SubtitleContentList ContentPanel::selected_subtitle () { - ContentList c = selected (); SubtitleContentList sc; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); + + BOOST_FOREACH (shared_ptr i, selected ()) { + shared_ptr t = dynamic_pointer_cast (i); if (t) { sc.push_back (t); } @@ -188,11 +194,10 @@ ContentPanel::selected_subtitle () FFmpegContentList ContentPanel::selected_ffmpeg () { - ContentList c = selected (); FFmpegContentList sc; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); + + BOOST_FOREACH (shared_ptr i, selected ()) { + shared_ptr t = dynamic_pointer_cast (i); if (t) { sc.push_back (t); } @@ -212,24 +217,31 @@ ContentPanel::film_changed (Film::Property p) break; } - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->film_changed (p); + BOOST_FOREACH (ContentSubPanel* i, _panels) { + i->film_changed (p); } -} +} void ContentPanel::selection_changed () { setup_sensitivity (); - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->content_selection_changed (); + BOOST_FOREACH (ContentSubPanel* i, _panels) { + i->content_selection_changed (); } } void ContentPanel::add_file_clicked () { + /* This method is also called when Ctrl-A is pressed, so check that our notebook page + is visible. + */ + if (_parent->GetCurrentPage() != _panel) { + return; + } + /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using non-Latin filenames or paths. */ @@ -243,12 +255,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,30 +268,31 @@ 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, path)); - } catch (...) { - try { - content.reset (new DCPContent (_film, path)); - } catch (...) { - error_dialog (_panel, _("Could not find any images nor a DCP in that folder")); + shared_ptr content = content_factory (_film, path); + + shared_ptr ic = dynamic_pointer_cast (content); + if (ic) { + 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); + ic->set_video_frame_rate (frame_rate); } + + _film->examine_and_add_content (content); } void @@ -301,7 +313,7 @@ ContentPanel::timeline_clicked () _timeline_dialog->Destroy (); _timeline_dialog = 0; } - + _timeline_dialog = new TimelineDialog (this, _film); _timeline_dialog->Show (); } @@ -309,7 +321,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 */ @@ -335,9 +347,9 @@ ContentPanel::setup_sensitivity () } void -ContentPanel::set_film (shared_ptr f) +ContentPanel::set_film (shared_ptr film) { - _film = f; + _film = film; film_changed (Film::CONTENT); film_changed (Film::AUDIO_CHANNELS); @@ -358,8 +370,8 @@ ContentPanel::set_general_sensitivity (bool s) _timeline->Enable (s); /* Set the panels in the content notebook */ - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->Enable (s); + BOOST_FOREACH (ContentSubPanel* i, _panels) { + i->Enable (s); } } @@ -391,7 +403,7 @@ ContentPanel::set_selection (weak_ptr wc) if (content[i] == wc.lock ()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } else { - _content->SetItemState (i, 0, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED); + _content->SetItemState (i, 0, wxLIST_STATE_SELECTED); } } } @@ -402,34 +414,61 @@ ContentPanel::film_content_changed (int property) if (property == ContentProperty::PATH || property == ContentProperty::POSITION || property == DCPContentProperty::CAN_BE_PLAYED) { setup (); } - - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->film_content_changed (property); + + BOOST_FOREACH (ContentSubPanel* i, _panels) { + i->film_content_changed (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; + BOOST_FOREACH (shared_ptr i, content) { + 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) { selected_summary = wx_to_std (_content->GetItemText (s)); } - - _content->DeleteAllItems (); - ContentList content = _film->content (); - sort (content.begin(), content.end(), ContentSorter ()); + _content->DeleteAllItems (); - for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { + BOOST_FOREACH (shared_ptr i, content) { int const t = _content->GetItemCount (); - bool const valid = (*i)->paths_valid (); - shared_ptr dcp = dynamic_pointer_cast (*i); + bool const valid = i->paths_valid (); + shared_ptr dcp = dynamic_pointer_cast (i); bool const needs_kdm = dcp && !dcp->can_be_played (); - string s = (*i)->summary (); - + string s = i->summary (); + if (!valid) { s = _("MISSING: ") + s; } @@ -440,7 +479,7 @@ ContentPanel::setup () _content->InsertItem (t, std_to_wx (s)); - if ((*i)->summary() == selected_summary) { + if (i->summary() == selected_summary) { _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -461,9 +500,33 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) if (!_film) { return; } - + 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); } }