X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=a6338ecfd090f99b2f6def10683abadf16559817;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hp=5892d9c4cdb7a7127ff3db0dfb3a7e15e848780b;hpb=d462bce261da5836b8ee8703ef8c4807f50a5586;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 5892d9c4c..a6338ecfd 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -22,13 +22,13 @@ #include "wx_util.h" #include "video_panel.h" #include "audio_panel.h" -#include "subtitle_panel.h" +#include "text_panel.h" #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/text_content.h" #include "lib/video_content.h" #include "lib/ffmpeg_content.h" #include "lib/content_factory.h" @@ -36,6 +36,11 @@ #include "lib/dcp_content.h" #include "lib/case_insensitive_sorter.h" #include "lib/playlist.h" +#include "lib/config.h" +#include "lib/log.h" +#include "lib/compose.hpp" +#include "lib/string_text_file_content.h" +#include "lib/string_text_file.h" #include #include #include @@ -47,15 +52,19 @@ using std::list; using std::string; using std::cout; using std::vector; +using std::max; using std::exception; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); + ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmViewer* viewer) : _timeline_dialog (0) , _parent (n) + , _last_selected_tab (0) , _film (film) , _film_viewer (viewer) , _generally_sensitive (true) @@ -79,13 +88,17 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie 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.")); + _add_file->SetToolTip (_("Add video, image, sound or subtitle 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.")); + _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files.")); b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _add_dcp = new wxButton (_panel, wxID_ANY, _("Add DCP...")); + _add_dcp->SetToolTip (_("Add a DCP.")); + b->Add (_add_dcp, 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); @@ -114,21 +127,24 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _panels.push_back (_video_panel); _audio_panel = new AudioPanel (this); _panels.push_back (_audio_panel); - _subtitle_panel = new SubtitlePanel (this); - _panels.push_back (_subtitle_panel); + for (int i = 0; i < CAPTION_COUNT; ++i) { + _caption_panel[i] = new TextPanel (this, static_cast(i)); + _panels.push_back (_caption_panel[i]); + } _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)); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this)); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1)); + _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this)); + _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::selection_changed, this)); + _content->Bind (wxEVT_LIST_ITEM_RIGHT_CLICK, boost::bind (&ContentPanel::right_click, this, _1)); _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, 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)); + _add_file->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_file_clicked, this)); + _add_folder->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_folder_clicked, this)); + _add_dcp->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::add_dcp_clicked, this)); + _remove->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::remove_clicked, this, false)); + _earlier->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::earlier_clicked, this)); + _later->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::later_clicked, this)); + _timeline->Bind (wxEVT_BUTTON, boost::bind (&ContentPanel::timeline_clicked, this)); } ContentList @@ -179,12 +195,12 @@ ContentPanel::selected_audio () } ContentList -ContentPanel::selected_subtitle () +ContentPanel::selected_caption () { ContentList sc; BOOST_FOREACH (shared_ptr i, selected ()) { - if (i->subtitle) { + if (!i->caption.empty()) { sc.push_back (i); } } @@ -243,19 +259,131 @@ ContentPanel::selection_changed () } optional go_to; - BOOST_FOREACH (shared_ptr i, selected ()) { - if (!go_to || i->position() < go_to.get()) { - go_to = i->position (); + BOOST_FOREACH (shared_ptr i, selected()) { + DCPTime p; + p = i->position(); + if (dynamic_pointer_cast(i) && i->paths_valid()) { + /* Rather special case; if we select a text subtitle file jump to its + first subtitle. + */ + StringTextFile ts (dynamic_pointer_cast(i)); + if (ts.first()) { + p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position())); + } + } + if (!go_to || p < go_to.get()) { + go_to = p; } } - if (go_to) { - _film_viewer->set_position (go_to.get ()); + if (go_to && Config::instance()->jump_to_selected ()) { + _film_viewer->set_position (go_to.get().ceil(_film->video_frame_rate())); } if (_timeline_dialog) { - _timeline_dialog->set_selection (selected ()); + _timeline_dialog->set_selection (selected()); + } + + /* Make required tabs visible */ + + if (_notebook->GetPageCount() > 1) { + /* There's more than one tab in the notebook so the current selection could be meaningful + to the user; store it so that we can try to restore it later. + */ + _last_selected_tab = 0; + if (_notebook->GetSelection() != wxNOT_FOUND) { + _last_selected_tab = _notebook->GetPage(_notebook->GetSelection()); + } + } + + bool have_video = false; + bool have_audio = false; + bool have_caption[CAPTION_COUNT] = { false, false }; + BOOST_FOREACH (shared_ptr i, selected()) { + if (i->video) { + have_video = true; + } + if (i->audio) { + have_audio = true; + } + BOOST_FOREACH (shared_ptr j, i->caption) { + have_caption[j->original_type()] = true; + } + } + + bool video_panel = false; + bool audio_panel = false; + bool caption_panel[CAPTION_COUNT] = { false, false }; + for (size_t i = 0; i < _notebook->GetPageCount(); ++i) { + if (_notebook->GetPage(i) == _video_panel) { + video_panel = true; + } else if (_notebook->GetPage(i) == _audio_panel) { + audio_panel = true; + } + for (int j = 0; j < CAPTION_COUNT; ++j) { + if (_notebook->GetPage(i) == _caption_panel[j]) { + caption_panel[j] = true; + } + } } + + int off = 0; + + if (have_video != video_panel) { + if (video_panel) { + _notebook->RemovePage (off); + } + if (have_video) { + _notebook->InsertPage (off, _video_panel, _video_panel->name()); + } + } + + if (have_video) { + ++off; + } + + if (have_audio != audio_panel) { + if (audio_panel) { + _notebook->RemovePage (off); + } + if (have_audio) { + _notebook->InsertPage (off, _audio_panel, _audio_panel->name()); + } + } + + if (have_audio) { + ++off; + } + + for (int i = 0; i < CAPTION_COUNT; ++i) { + if (have_caption[i] != caption_panel[i]) { + if (caption_panel[i]) { + _notebook->RemovePage (off); + } + if (have_caption[i]) { + _notebook->InsertPage (off, _caption_panel[i], _caption_panel[i]->name()); + } + } + if (have_caption[i]) { + ++off; + } + } + + /* Set up the tab selection */ + + bool done = false; + for (size_t i = 0; i < _notebook->GetPageCount(); ++i) { + if (_notebook->GetPage(i) == _last_selected_tab) { + _notebook->SetSelection (i); + done = true; + } + } + + if (!done) { + _notebook->SetSelection (0); + } + + SelectionChanged (); } void @@ -264,7 +392,7 @@ 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) { + if (_parent->GetCurrentPage() != _panel || !_film) { return; } @@ -310,7 +438,7 @@ ContentPanel::add_folder_clicked () return; } - shared_ptr content; + list > content; try { content = content_factory (_film, path); @@ -319,26 +447,47 @@ ContentPanel::add_folder_clicked () return; } - if (!content) { + if (content.empty ()) { error_dialog (_parent, _("No content found in this folder.")); return; } - 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; + BOOST_FOREACH (shared_ptr i, content) { + shared_ptr ic = dynamic_pointer_cast (i); + if (ic) { + ImageSequenceDialog* e = new ImageSequenceDialog (_panel); + r = e->ShowModal (); + float const frame_rate = e->frame_rate (); + e->Destroy (); + + if (r != wxID_OK) { + return; + } + + ic->set_video_frame_rate (frame_rate); } - ic->set_video_frame_rate (frame_rate); + _film->examine_and_add_content (i); + } +} + +void +ContentPanel::add_dcp_clicked () +{ + wxDirDialog* d = new wxDirDialog (_panel, _("Choose a DCP folder"), wxT (""), wxDD_DIR_MUST_EXIST); + int r = d->ShowModal (); + boost::filesystem::path const path (wx_to_std (d->GetPath ())); + d->Destroy (); + + if (r != wxID_OK) { + return; } - _film->examine_and_add_content (content); + try { + _film->examine_and_add_content (shared_ptr (new DCPContent (_film, path))); + } catch (exception& e) { + error_dialog (_parent, e.what()); + } } /** @return true if this remove "click" should be ignored */ @@ -363,6 +512,10 @@ ContentPanel::remove_clicked (bool hotkey) void ContentPanel::timeline_clicked () { + if (!_film) { + return; + } + if (_timeline_dialog) { _timeline_dialog->Destroy (); _timeline_dialog = 0; @@ -384,20 +537,23 @@ ContentPanel::setup_sensitivity () { _add_file->Enable (_generally_sensitive); _add_folder->Enable (_generally_sensitive); + _add_dcp->Enable (_generally_sensitive); ContentList selection = selected (); ContentList video_selection = selected_video (); ContentList audio_selection = selected_audio (); - _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); + _remove->Enable (_generally_sensitive && !selection.empty()); + _earlier->Enable (_generally_sensitive && selection.size() == 1); + _later->Enable (_generally_sensitive && selection.size() == 1); + _timeline->Enable (_generally_sensitive && _film && !_film->content().empty()); - _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive); - _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive); - _subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive); - _timing_panel->Enable (selection.size() == 1 && _generally_sensitive); + _video_panel->Enable (_generally_sensitive && video_selection.size() > 0); + _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); + for (int i = 0; i < CAPTION_COUNT; ++i) { + _caption_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->caption.empty()); + } + _timing_panel->Enable (_generally_sensitive); } void @@ -417,19 +573,7 @@ void ContentPanel::set_general_sensitivity (bool s) { _generally_sensitive = s; - - _content->Enable (s); - _add_file->Enable (s); - _add_folder->Enable (s); - _remove->Enable (s); - _earlier->Enable (s); - _later->Enable (s); - _timeline->Enable (s); - - /* Set the panels in the content notebook */ - BOOST_FOREACH (ContentSubPanel* i, _panels) { - i->Enable (s); - } + setup_sensitivity (); } void @@ -465,10 +609,29 @@ ContentPanel::set_selection (weak_ptr wc) } } +void +ContentPanel::set_selection (ContentList cl) +{ + ContentList content = _film->content (); + for (size_t i = 0; i < content.size(); ++i) { + if (find(cl.begin(), cl.end(), content[i]) != cl.end()) { + _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + } else { + _content->SetItemState (i, 0, wxLIST_STATE_SELECTED); + } + } +} + void ContentPanel::film_content_changed (int property) { - if (property == ContentProperty::PATH || property == DCPContentProperty::NEEDS_ASSETS || property == DCPContentProperty::NEEDS_KDM) { + if ( + property == ContentProperty::PATH || + property == DCPContentProperty::NEEDS_ASSETS || + property == DCPContentProperty::NEEDS_KDM || + property == DCPContentProperty::NAME + ) { + setup (); } @@ -497,11 +660,17 @@ ContentPanel::setup () BOOST_FOREACH (shared_ptr i, content) { int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); + + /* Temporary debugging for Igor */ + BOOST_FOREACH (boost::filesystem::path j, i->paths()) { + LOG_GENERAL ("Check %1 %2 answer %3", j.string(), boost::filesystem::exists(j) ? "yes" : "no", valid ? "yes" : "no"); + } + shared_ptr dcp = dynamic_pointer_cast (i); bool const needs_kdm = dcp && dcp->needs_kdm (); bool const needs_assets = dcp && dcp->needs_assets (); - string s = i->summary (); + wxString s = std_to_wx (i->summary ()); if (!valid) { s = _("MISSING: ") + s; @@ -517,7 +686,7 @@ ContentPanel::setup () wxListItem item; item.SetId (t); - item.SetText (std_to_wx (s)); + item.SetText (s); item.SetData (i.get ()); _content->InsertItem (item); @@ -534,6 +703,8 @@ ContentPanel::setup () /* Select the item of content if none was selected before */ _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } + + setup_sensitivity (); } void @@ -564,7 +735,13 @@ ContentPanel::add_files (list paths) /* XXX: check for lots of files here and do something */ - for (list::const_iterator i = paths.begin(); i != paths.end(); ++i) { - _film->examine_and_add_content (content_factory (_film, *i)); + try { + BOOST_FOREACH (boost::filesystem::path i, paths) { + BOOST_FOREACH (shared_ptr j, content_factory (_film, i)) { + _film->examine_and_add_content (j); + } + } + } catch (exception& e) { + error_dialog (_parent, e.what()); } }