swaroop: make disable-timeline work.

diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 73b24a02d769e9aa0c67c12c70e5bd896ba4be3b..fafac55d61010922e7257856b4ad7cb4b2edc57b 100644 (file)
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -38,6 +38,7 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        , _play_button (new wxButton(this, wxID_ANY, _("Play")))
        , _pause_button (new wxButton(this, wxID_ANY, _("Pause")))
        , _stop_button (new wxButton(this, wxID_ANY, _("Stop")))
+       , _current_disable_timeline (false)
 {
        _button_sizer->Add (_play_button, 0, wxEXPAND);
        _button_sizer->Add (_pause_button, 0, wxEXPAND);
@@ -107,7 +108,7 @@ SwaroopControls::setup_sensitivity ()
        _play_button->Enable (c && !_viewer->playing());
        _pause_button->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT) && _viewer->playing());
        _stop_button->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT));
-       _slider->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT));
+       _slider->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT) && !_current_disable_timeline);
 }
 
 void
@@ -149,6 +150,22 @@ SwaroopControls::image_changed (boost::weak_ptr<PlayerVideo> weak_pv)
                return;
        }
 
+       if (c == _current_content.lock()) {
+               return;
+       }
+
+       _current_content = c;
+
+       long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+       if (_selected_playlist) {
+               BOOST_FOREACH (SPLEntry i, _playlists[*_selected_playlist].get()) {
+                       if (i.content == c) {
+                               _current_disable_timeline = i.disable_timeline;
+                               setup_sensitivity ();
+                       }
+               }
+       }
+
        shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (c);
        if (!dc) {
                return;
@@ -206,9 +223,12 @@ SwaroopControls::spl_selection_changed ()
 
        long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
        if (selected == -1) {
+               _selected_playlist = boost::none;
                return;
        }
 
+       _selected_playlist = selected;
+
        shared_ptr<Film> film (new Film(optional<boost::filesystem::path>()));
 
        int N = 0;

diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
index fae54ea0aca3ef5a20a7f7c7f6c6a392d679c77a..bd39f556dae9e83e526c167a03906a4649da618a 100644 (file)
--- a/src/wx/swaroop_controls.h
+++ b/src/wx/swaroop_controls.h
@@ -57,7 +57,10 @@ private:
        wxListCtrl* _current_spl_view;
        wxTextCtrl* _log;
 
+       boost::weak_ptr<Content> _current_content;
        boost::optional<dcp::ContentKind> _current_kind;
+       bool _current_disable_timeline;
 
        std::vector<SPL> _playlists;
+       boost::optional<int> _selected_playlist;
 };