X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=d1a00c02122ba354fdfdd4ea03146df1fc53b302;hp=066c3e93cadba2a126868391f0213daa7ec73e87;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=4704d088ae03ab2b5f73ceed577fd84935ad0640 diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 066c3e93c..d1a00c021 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -25,6 +26,7 @@ #include "timing_panel.h" #include "timeline_dialog.h" #include "image_sequence_dialog.h" +#include "film_viewer.h" #include "lib/audio_content.h" #include "lib/subtitle_content.h" #include "lib/video_content.h" @@ -32,27 +34,30 @@ #include "lib/content_factory.h" #include "lib/image_content.h" #include "lib/dcp_content.h" +#include "lib/case_insensitive_sorter.h" #include "lib/playlist.h" #include #include #include #include #include - -#include "lib/image_filename_sorter.cc" +#include using std::list; using std::string; using std::cout; using std::vector; +using std::exception; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using boost::optional; ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmViewer* viewer) : _timeline_dialog (0) , _parent (n) , _film (film) + , _film_viewer (viewer) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -111,7 +116,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _panels.push_back (_audio_panel); _subtitle_panel = new SubtitlePanel (this); _panels.push_back (_subtitle_panel); - _timing_panel = new TimingPanel (this, viewer); + _timing_panel = new TimingPanel (this, _film_viewer); _panels.push_back (_timing_panel); _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); @@ -120,7 +125,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1)); _add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_file_clicked, this)); _add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_folder_clicked, this)); - _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this)); + _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this, false)); _earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::earlier_clicked, this)); _later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::later_clicked, this)); _timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::timeline_clicked, this)); @@ -145,45 +150,42 @@ ContentPanel::selected () return sel; } -VideoContentList +ContentList ContentPanel::selected_video () { - VideoContentList vc; + ContentList vc; BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); - if (t) { - vc.push_back (t); + if (i->video) { + vc.push_back (i); } } return vc; } -AudioContentList +ContentList ContentPanel::selected_audio () { - AudioContentList ac; + ContentList ac; BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); - if (t) { - ac.push_back (t); + if (i->audio) { + ac.push_back (i); } } return ac; } -SubtitleContentList +ContentList ContentPanel::selected_subtitle () { - SubtitleContentList sc; + ContentList sc; BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); - if (t) { - sc.push_back (t); + if (i->subtitle) { + sc.push_back (i); } } @@ -210,6 +212,7 @@ ContentPanel::film_changed (Film::Property p) { switch (p) { case Film::CONTENT: + case Film::CONTENT_ORDER: setup (); break; default: @@ -224,11 +227,35 @@ ContentPanel::film_changed (Film::Property p) void ContentPanel::selection_changed () { + if (_last_selected == selected()) { + /* This was triggered by a re-build of the view but the selection + did not really change. + */ + return; + } + + _last_selected = selected (); + setup_sensitivity (); BOOST_FOREACH (ContentSubPanel* i, _panels) { i->content_selection_changed (); } + + optional go_to; + BOOST_FOREACH (shared_ptr i, selected ()) { + if (!go_to || i->position() < go_to.get()) { + go_to = i->position (); + } + } + + if (go_to) { + _film_viewer->set_position (go_to.get ()); + } + + if (_timeline_dialog) { + _timeline_dialog->set_selection (selected ()); + } } void @@ -244,7 +271,15 @@ ContentPanel::add_file_clicked () /* 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 (_panel, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR); + wxFileDialog* d = new wxFileDialog ( + _panel, + _("Choose a file or files"), + wxT (""), + wxT (""), + wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"), + wxFD_MULTIPLE | wxFD_CHANGE_DIR + ); + int const r = d->ShowModal (); if (r != wxID_OK) { @@ -275,7 +310,19 @@ ContentPanel::add_folder_clicked () return; } - shared_ptr content = content_factory (_film, path); + shared_ptr content; + + try { + content = content_factory (_film, path); + } catch (exception& e) { + error_dialog (_parent, e.what()); + return; + } + + if (!content) { + error_dialog (_parent, _("No content found in this folder.")); + return; + } shared_ptr ic = dynamic_pointer_cast (content); if (ic) { @@ -294,15 +341,23 @@ ContentPanel::add_folder_clicked () _film->examine_and_add_content (content); } -void -ContentPanel::remove_clicked () +/** @return true if this remove "click" should be ignored */ +bool +ContentPanel::remove_clicked (bool hotkey) { - ContentList c = selected (); - if (c.size() == 1) { - _film->remove_content (c.front ()); + /* If the method was called because Delete was pressed check that our notebook page + is visible and that the content list is focussed. + */ + if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) { + return true; + } + + BOOST_FOREACH (shared_ptr i, selected ()) { + _film->remove_content (i); } selection_changed (); + return false; } void @@ -331,17 +386,17 @@ ContentPanel::setup_sensitivity () _add_folder->Enable (_generally_sensitive); ContentList selection = selected (); - VideoContentList video_selection = selected_video (); - AudioContentList audio_selection = selected_audio (); + ContentList video_selection = selected_video (); + ContentList audio_selection = selected_audio (); - _remove->Enable (selection.size() == 1 && _generally_sensitive); + _remove->Enable (!selection.empty() && _generally_sensitive); _earlier->Enable (selection.size() == 1 && _generally_sensitive); _later->Enable (selection.size() == 1 && _generally_sensitive); _timeline->Enable (!_film->content().empty() && _generally_sensitive); _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive); _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive); - _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast (selection.front()) && _generally_sensitive); + _subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive); _timing_panel->Enable (selection.size() == 1 && _generally_sensitive); } @@ -410,7 +465,7 @@ ContentPanel::set_selection (weak_ptr wc) void ContentPanel::film_content_changed (int property) { - if (property == ContentProperty::PATH || property == ContentProperty::POSITION || property == DCPContentProperty::CAN_BE_PLAYED) { + if (property == ContentProperty::PATH || property == DCPContentProperty::CAN_BE_PLAYED) { setup (); } @@ -423,39 +478,15 @@ 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; + Content* selected_content = 0; int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (s != -1) { - selected_summary = wx_to_std (_content->GetItemText (s)); + wxListItem item; + item.SetId (s); + item.SetMask (wxLIST_MASK_DATA); + _content->GetItem (item); + selected_content = reinterpret_cast (item.GetData ()); } _content->DeleteAllItems (); @@ -476,9 +507,13 @@ ContentPanel::setup () s = _("NEEDS KDM: ") + s; } - _content->InsertItem (t, std_to_wx (s)); + wxListItem item; + item.SetId (t); + item.SetText (std_to_wx (s)); + item.SetData (i.get ()); + _content->InsertItem (item); - if (i->summary() == selected_summary) { + if (i.get() == selected_content) { _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -487,7 +522,7 @@ ContentPanel::setup () } } - if (selected_summary.empty () && !content.empty ()) { + if (!selected_content && !content.empty ()) { /* Select the item of content if none was selected before */ _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -513,19 +548,15 @@ 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. + I can't reproduce that, but sort them anyway. Don't use ImageFilenameSorter as a normal + alphabetical sort is expected here. */ - paths.sort (ImageFilenameSorter ()); + paths.sort (CaseInsensitiveSorter ()); /* 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); + _film->examine_and_add_content (content_factory (_film, *i)); } }