swaroop:

Remove strange update_playlist_directory() on setting film; that made the
_spl_view behave strangely since on selection all its contents were deleted
and re-created.

Disable _spl_view during playback.

diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 2546412efe2fe36a7151cb8bc5da3cd162ad33bc..567784b3aad1ad6e7dce84b4f46bd7a2b2ec474a 100644 (file)
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -110,6 +110,7 @@ SwaroopControls::setup_sensitivity ()
        _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) && !_current_disable_timeline);
+       _spl_view->Enable (!_viewer->playing());
 }
 
 void
@@ -261,6 +262,5 @@ void
 SwaroopControls::set_film (shared_ptr<Film> film)
 {
        Controls::set_film (film);
-       update_playlist_directory ();
        setup_sensitivity ();
 }