Partial split of film viewer.

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index bc3966f6c6fdff6c77930c79165211fee9ec793b..e5990a564b1d1068f8841a996f223ae820398a91 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -26,7 +26,7 @@
 #include "timing_panel.h"
 #include "timeline_dialog.h"
 #include "image_sequence_dialog.h"
-#include "film_viewer.h"
+#include "control_film_viewer.h"
 #include "lib/audio_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
@@ -61,7 +61,7 @@ using boost::optional;
 
 #define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
-ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
+ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, ControlFilmViewer* viewer)
        : _video_panel (0)
        , _audio_panel (0)
        , _timeline_dialog (0)
@@ -70,6 +70,7 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmVie
        , _film (film)
        , _film_viewer (viewer)
        , _generally_sensitive (true)
+       , _ignore_deselect (false)
 {
        for (int i = 0; i < TEXT_COUNT; ++i) {
                _text_panel[i] = 0;
@@ -132,8 +133,8 @@ ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmVie
        _timing_panel = new TimingPanel (this, _film_viewer);
        _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));
@@ -240,7 +241,32 @@ ContentPanel::film_changed (Film::Property 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
@@ -276,7 +302,7 @@ 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())));
+               signal_manager->when_idle(boost::bind(&ControlFilmViewer::set_position, _film_viewer, go_to.get().ceil(_film->video_frame_rate())));
        }
 
        if (_timeline_dialog) {
@@ -326,7 +352,6 @@ ContentPanel::selection_changed ()
 
        if (have_audio && !_audio_panel) {
                _audio_panel = new AudioPanel (this);
-               _audio_panel->set_film (_film);
                _notebook->InsertPage (off, _audio_panel, _audio_panel->name());
        } else if (!have_audio && _audio_panel) {
                _notebook->DeletePage (off);
@@ -487,7 +512,7 @@ ContentPanel::remove_clicked (bool hotkey)
                _film->remove_content (i);
        }
 
-       selection_changed ();
+       check_selection ();
        return false;
 }
 
@@ -556,7 +581,7 @@ ContentPanel::set_film (shared_ptr<Film> film)
 
        film_changed (Film::CONTENT);
        film_changed (Film::AUDIO_CHANNELS);
-       selection_changed ();
+       check_selection ();
        setup_sensitivity ();
 }
 
@@ -573,7 +598,7 @@ ContentPanel::earlier_clicked ()
        ContentList sel = selected ();
        if (sel.size() == 1) {
                _film->move_content_earlier (sel.front ());
-               selection_changed ();
+               check_selection ();
        }
 }
 
@@ -583,7 +608,7 @@ ContentPanel::later_clicked ()
        ContentList sel = selected ();
        if (sel.size() == 1) {
                _film->move_content_later (sel.front ());
-               selection_changed ();
+               check_selection ();
        }
 }