X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=e72ca28a18a11b0f667b7dfe545fc0a6d1ea3457;hb=8b2a3f31b6b4238d8534549f495e7276174ddfba;hp=1680e5926b2a8d36e223401391199e43eee2c93b;hpb=e2361edc2fc2c07d6474bf5a7f76dc2a5b55ee81;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 1680e5926..e72ca28a1 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -22,13 +22,14 @@ #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 "dcpomatic_button.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" @@ -39,8 +40,9 @@ #include "lib/config.h" #include "lib/log.h" #include "lib/compose.hpp" -#include "lib/text_subtitle_content.h" -#include "lib/text_subtitle.h" +#include "lib/string_text_file_content.h" +#include "lib/string_text_file.h" +#include "lib/dcpomatic_log.h" #include #include #include @@ -52,21 +54,28 @@ 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) +ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptr viewer) + : _video_panel (0) + , _audio_panel (0) + , _timeline_dialog (0) , _parent (n) + , _last_selected_tab (0) , _film (film) , _film_viewer (viewer) , _generally_sensitive (true) + , _ignore_deselect (false) { + for (int i = 0; i < TEXT_COUNT; ++i) { + _text_panel[i] = 0; + } + _panel = new wxPanel (n); _sizer = new wxBoxSizer (wxVERTICAL); _panel->SetSizer (_sizer); @@ -85,31 +94,31 @@ 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 = new Button (_panel, _("Add file(s)...")); _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 = new Button (_panel, _("Add folder...")); _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 = new Button (_panel, _("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 = new Button (_panel, _("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, _("Earlier")); + _earlier = new Button (_panel, _("Earlier")); _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, _("Later")); + _later = new Button (_panel, _("Later")); _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 = new Button (_panel, _("Timeline...")); _timeline->SetToolTip (_("Open the timeline for the film.")); b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); @@ -121,17 +130,11 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr film, FilmVie _notebook = new wxNotebook (_panel, wxID_ANY); _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6); - _video_panel = new VideoPanel (this); - _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); _timing_panel = new TimingPanel (this, _film_viewer); - _panels.push_back (_timing_panel); + _notebook->AddPage (_timing_panel, _("Timing"), false); - _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_SELECTED, boost::bind (&ContentPanel::item_selected, this)); + _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, 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_BUTTON, boost::bind (&ContentPanel::add_file_clicked, this)); @@ -154,8 +157,9 @@ ContentPanel::selected () break; } - if (s < int (_film->content().size ())) { - sel.push_back (_film->content()[s]); + ContentList cl = _film->content(); + if (s < int (cl.size())) { + sel.push_back (cl[s]); } } @@ -191,12 +195,12 @@ ContentPanel::selected_audio () } ContentList -ContentPanel::selected_subtitle () +ContentPanel::selected_text () { ContentList sc; BOOST_FOREACH (shared_ptr i, selected ()) { - if (i->subtitle) { + if (!i->text.empty()) { sc.push_back (i); } } @@ -231,13 +235,38 @@ ContentPanel::film_changed (Film::Property p) break; } - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->film_changed (p); } } void -ContentPanel::selection_changed () +ContentPanel::item_deselected () +{ + /* Maybe this is just a re-click on the same item; if not, _ignore_deselect will stay + false and item_deselected_foo will handle the deselection. + */ + _ignore_deselect = false; + signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this)); +} + +void +ContentPanel::item_deselected_idle () +{ + if (!_ignore_deselect) { + check_selection (); + } +} + +void +ContentPanel::item_selected () +{ + _ignore_deselect = true; + check_selection (); +} + +void +ContentPanel::check_selection () { if (_last_selected == selected()) { /* This was triggered by a re-build of the view but the selection @@ -250,19 +279,19 @@ ContentPanel::selection_changed () setup_sensitivity (); - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->content_selection_changed (); } optional go_to; - BOOST_FOREACH (shared_ptr i, selected ()) { + BOOST_FOREACH (shared_ptr i, selected()) { DCPTime p; p = i->position(); - if (dynamic_pointer_cast(i)) { + if (dynamic_pointer_cast(i) && i->paths_valid()) { /* Rather special case; if we select a text subtitle file jump to its first subtitle. */ - TextSubtitle ts (dynamic_pointer_cast(i)); + StringTextFile ts (dynamic_pointer_cast(i)); if (ts.first()) { p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position())); } @@ -272,14 +301,97 @@ ContentPanel::selection_changed () } } - if (go_to && Config::instance()->jump_to_selected ()) { - _film_viewer->set_position (go_to.get().ceil(_film->video_frame_rate())); + if (go_to && Config::instance()->jump_to_selected() && signal_manager) { + shared_ptr fv = _film_viewer.lock (); + DCPOMATIC_ASSERT (fv); + signal_manager->when_idle(boost::bind(&FilmViewer::seek, fv.get(), go_to.get().ceil(_film->video_frame_rate()), true)); } 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_text[TEXT_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->text) { + have_text[j->original_type()] = true; + } + } + + int off = 0; + + if (have_video && !_video_panel) { + _video_panel = new VideoPanel (this); + _notebook->InsertPage (off, _video_panel, _video_panel->name()); + } else if (!have_video && _video_panel) { + _notebook->DeletePage (off); + _video_panel = 0; + } + + if (have_video) { + ++off; + } + + if (have_audio && !_audio_panel) { + _audio_panel = new AudioPanel (this); + _notebook->InsertPage (off, _audio_panel, _audio_panel->name()); + } else if (!have_audio && _audio_panel) { + _notebook->DeletePage (off); + _audio_panel = 0; + } + + if (have_audio) { + ++off; + } + + for (int i = 0; i < TEXT_COUNT; ++i) { + if (have_text[i] && !_text_panel[i]) { + _text_panel[i] = new TextPanel (this, static_cast(i)); + _notebook->InsertPage (off, _text_panel[i], _text_panel[i]->name()); + } else if (!have_text[i] && _text_panel[i]) { + _notebook->DeletePage (off); + _text_panel[i] = 0; + } + if (have_text[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->GetPageCount() > 0) { + _notebook->SetSelection (0); + } + + setup_sensitivity (); SelectionChanged (); } @@ -338,7 +450,7 @@ ContentPanel::add_folder_clicked () list > content; try { - content = content_factory (_film, path); + content = content_factory (path); } catch (exception& e) { error_dialog (_parent, e.what()); return; @@ -381,7 +493,7 @@ ContentPanel::add_dcp_clicked () } try { - _film->examine_and_add_content (shared_ptr (new DCPContent (_film, path))); + _film->examine_and_add_content (shared_ptr (new DCPContent (path))); } catch (exception& e) { error_dialog (_parent, e.what()); } @@ -402,7 +514,7 @@ ContentPanel::remove_clicked (bool hotkey) _film->remove_content (i); } - selection_changed (); + check_selection (); return false; } @@ -419,6 +531,7 @@ ContentPanel::timeline_clicked () } _timeline_dialog = new TimelineDialog (this, _film); + _timeline_dialog->set_selection (selected()); _timeline_dialog->Show (); } @@ -445,22 +558,32 @@ ContentPanel::setup_sensitivity () _later->Enable (_generally_sensitive && selection.size() == 1); _timeline->Enable (_generally_sensitive && _film && !_film->content().empty()); - _video_panel->Enable (_generally_sensitive && video_selection.size() > 0); - _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); - _subtitle_panel->Enable (_generally_sensitive && selection.size() == 1 && selection.front()->subtitle); - _timing_panel->Enable (_generally_sensitive); + if (_video_panel) { + _video_panel->Enable (_generally_sensitive && video_selection.size() > 0); + } + if (_audio_panel) { + _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); + } + for (int i = 0; i < TEXT_COUNT; ++i) { + if (_text_panel[i]) { + _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty()); + } + } + _timing_panel->Enable (_generally_sensitive); } void ContentPanel::set_film (shared_ptr film) { - _audio_panel->set_film (film); + if (_audio_panel) { + _audio_panel->set_film (film); + } _film = film; film_changed (Film::CONTENT); film_changed (Film::AUDIO_CHANNELS); - selection_changed (); + check_selection (); setup_sensitivity (); } @@ -477,7 +600,7 @@ ContentPanel::earlier_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_earlier (sel.front ()); - selection_changed (); + check_selection (); } } @@ -487,7 +610,7 @@ ContentPanel::later_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_later (sel.front ()); - selection_changed (); + check_selection (); } } @@ -530,7 +653,7 @@ ContentPanel::film_content_changed (int property) setup (); } - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->film_content_changed (property); } } @@ -632,7 +755,7 @@ ContentPanel::add_files (list paths) try { BOOST_FOREACH (boost::filesystem::path i, paths) { - BOOST_FOREACH (shared_ptr j, content_factory (_film, i)) { + BOOST_FOREACH (shared_ptr j, content_factory(i)) { _film->examine_and_add_content (j); } } @@ -640,3 +763,22 @@ ContentPanel::add_files (list paths) error_dialog (_parent, e.what()); } } + +list +ContentPanel::panels () const +{ + list p; + if (_video_panel) { + p.push_back (_video_panel); + } + if (_audio_panel) { + p.push_back (_audio_panel); + } + for (int i = 0; i < TEXT_COUNT; ++i) { + if (_text_panel[i]) { + p.push_back (_text_panel[i]); + } + } + p.push_back (_timing_panel); + return p; +}