X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=d1315ac34a08265f543b49feff1c42ac970a4eb4;hb=696ff1c534d59483bed3db06705b554f615a7b85;hp=33308b1126dc70f6ce698d3ab0a15d07c96c02e0;hpb=362a5e86b25374054cee29168b2423346d18e922;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 33308b112..d1315ac34 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 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,14 +17,6 @@ */ -#include "lib/audio_content.h" -#include "lib/subtitle_content.h" -#include "lib/video_content.h" -#include "lib/ffmpeg_content.h" -#include "lib/content_factory.h" -#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" @@ -33,12 +25,22 @@ #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" +#include "lib/ffmpeg_content.h" +#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 "lib/image_filename_sorter.cc" +#include +#include using std::list; using std::string; @@ -47,10 +49,13 @@ using std::vector; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using boost::optional; -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) + , _film_viewer (viewer) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -61,7 +66,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); @@ -70,27 +75,27 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr f) _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); @@ -109,7 +114,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, _film_viewer); _panels.push_back (_timing_panel); _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); @@ -146,11 +151,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); } @@ -162,11 +166,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); } @@ -178,11 +181,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); } @@ -194,11 +196,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,34 +213,65 @@ ContentPanel::film_changed (Film::Property p) { switch (p) { case Film::CONTENT: + case Film::CONTENT_ORDER: setup (); break; default: 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 (); + } + + 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 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. */ - 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) { @@ -265,32 +297,19 @@ ContentPanel::add_folder_clicked () int r = d->ShowModal (); boost::filesystem::path const path (wx_to_std (d->GetPath ())); d->Destroy (); - + if (r != wxID_OK) { return; } - /* 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; - } + shared_ptr content = content_factory (_film, path); + if (!content) { + error_dialog (_parent, _("No content found in this folder.")); + return; } - if (is_dcp) { - try { - shared_ptr content (new DCPContent (_film, path)); - _film->examine_and_add_content (content); - } catch (...) { - error_dialog (_panel, _("Could not find a DCP in that folder.")); - } - } else { - + shared_ptr ic = dynamic_pointer_cast (content); + if (ic) { ImageSequenceDialog* e = new ImageSequenceDialog (_panel); r = e->ShowModal (); float const frame_rate = e->frame_rate (); @@ -300,25 +319,24 @@ ContentPanel::add_folder_clicked () return; } - 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; - } + ic->set_video_frame_rate (frame_rate); } + + _film->examine_and_add_content (content); } void ContentPanel::remove_clicked () { - ContentList c = selected (); - if (c.size() == 1) { - _film->remove_content (c.front ()); + /* This method is also called when Delete is pressed, so check that our notebook page + is visible. + */ + if (_parent->GetCurrentPage() != _panel) { + return; + } + + BOOST_FOREACH (shared_ptr i, selected ()) { + _film->remove_content (i); } selection_changed (); @@ -331,7 +349,7 @@ ContentPanel::timeline_clicked () _timeline_dialog->Destroy (); _timeline_dialog = 0; } - + _timeline_dialog = new TimelineDialog (this, _film); _timeline_dialog->Show (); } @@ -353,7 +371,7 @@ ContentPanel::setup_sensitivity () VideoContentList video_selection = selected_video (); AudioContentList 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); @@ -365,9 +383,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); @@ -388,8 +406,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); } } @@ -421,7 +439,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); } } } @@ -429,12 +447,12 @@ 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 (); } - - 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); } } @@ -442,8 +460,7 @@ 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. */ @@ -454,39 +471,39 @@ ContentPanel::setup () } vector proposed; - for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { - bool const valid = (*i)->paths_valid (); + BOOST_FOREACH (shared_ptr i, content) { + bool const valid = i->paths_valid (); - string s = (*i)->summary (); + 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 (); - 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; } @@ -497,7 +514,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); } @@ -518,7 +535,7 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) if (!_film) { return; } - + wxString* paths = event.GetFiles (); list path_list; for (int i = 0; i < event.GetNumberOfFiles(); i++) { @@ -532,19 +549,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)); } }