X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fcontent_panel.cc;h=254f1befbc12a2166c057dac846e89c6630cb9b6;hb=1f251f64efee1984e8ff662e44568a7619df7b2f;hp=9fc052e68e243dae6cc05601cd27babf84bc87de;hpb=20ff90b41550d03ec058c1ee2208e7f18382eb5b;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 9fc052e68..254f1befb 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -41,6 +41,7 @@ #include "lib/compose.hpp" #include "lib/string_text_file_content.h" #include "lib/string_text_file.h" +#include "lib/dcpomatic_log.h" #include #include #include @@ -59,16 +60,21 @@ 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); @@ -123,20 +129,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); - for (int i = 0; i < TEXT_COUNT; ++i) { - _text_panel[i] = new TextPanel (this, static_cast(i)); - _panels.push_back (_text_panel[i]); - } _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)); @@ -159,8 +156,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]); } } @@ -236,13 +234,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 @@ -255,7 +278,7 @@ ContentPanel::selection_changed () setup_sensitivity (); - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->content_selection_changed (); } @@ -278,7 +301,9 @@ ContentPanel::selection_changed () } if (go_to && Config::instance()->jump_to_selected() && signal_manager) { - signal_manager->when_idle(boost::bind(&FilmViewer::set_position, _film_viewer, go_to.get().ceil(_film->video_frame_rate()))); + 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) { @@ -312,44 +337,26 @@ ContentPanel::selection_changed () } } - bool video_panel = false; - bool audio_panel = false; - bool text_panel[TEXT_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 < TEXT_COUNT; ++j) { - if (_notebook->GetPage(i) == _text_panel[j]) { - text_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 && !_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) { - if (audio_panel) { - _notebook->RemovePage (off); - } - if (have_audio) { - _notebook->InsertPage (off, _audio_panel, _audio_panel->name()); - } + 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) { @@ -357,13 +364,12 @@ ContentPanel::selection_changed () } for (int i = 0; i < TEXT_COUNT; ++i) { - if (have_text[i] != text_panel[i]) { - if (text_panel[i]) { - _notebook->RemovePage (off); - } - if (have_text[i]) { - _notebook->InsertPage (off, _text_panel[i], _text_panel[i]->name()); - } + 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; @@ -384,6 +390,7 @@ ContentPanel::selection_changed () _notebook->SetSelection (0); } + setup_sensitivity (); SelectionChanged (); } @@ -442,7 +449,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; @@ -485,7 +492,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()); } @@ -506,7 +513,7 @@ ContentPanel::remove_clicked (bool hotkey) _film->remove_content (i); } - selection_changed (); + check_selection (); return false; } @@ -550,24 +557,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); + 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) { - _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty()); + if (_text_panel[i]) { + _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty()); + } } - _timing_panel->Enable (_generally_sensitive); + _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 (); } @@ -584,7 +599,7 @@ ContentPanel::earlier_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_earlier (sel.front ()); - selection_changed (); + check_selection (); } } @@ -594,7 +609,7 @@ ContentPanel::later_clicked () ContentList sel = selected (); if (sel.size() == 1) { _film->move_content_later (sel.front ()); - selection_changed (); + check_selection (); } } @@ -637,7 +652,7 @@ ContentPanel::film_content_changed (int property) setup (); } - BOOST_FOREACH (ContentSubPanel* i, _panels) { + BOOST_FOREACH (ContentSubPanel* i, panels()) { i->film_content_changed (property); } } @@ -739,7 +754,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); } } @@ -747,3 +762,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; +}