swaroop: unload film when playlist ends.

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

diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 6e3d052eb40a92ac4ec1e824b3f3ec8f2deb40bf..292898b164b291aff70b6f3d4c962ec9a2248c3f 100644 (file)
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -34,6 +34,7 @@
 using std::string;
 using std::cout;
 using std::exception;
+using std::sort;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
@@ -46,13 +47,13 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        , _next_button (new Button(this, "Next"))
        , _previous_button (new Button(this, "Previous"))
        , _current_disable_timeline (false)
-       , _current_disable_next_previous (false)
+       , _current_disable_next (false)
 {
+       _button_sizer->Add (_previous_button, 0, wxEXPAND);
        _button_sizer->Add (_play_button, 0, wxEXPAND);
        _button_sizer->Add (_pause_button, 0, wxEXPAND);
        _button_sizer->Add (_stop_button, 0, wxEXPAND);
        _button_sizer->Add (_next_button, 0, wxEXPAND);
-       _button_sizer->Add (_previous_button, 0, wxEXPAND);
 
        _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
        _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
@@ -92,7 +93,7 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        _current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
        _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500);
        _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
-       e_sizer->Add (left_sizer, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+       e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
        e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
        _v_sizer->Add (e_sizer, 1, wxEXPAND);
@@ -191,8 +192,8 @@ SwaroopControls::setup_sensitivity ()
        _pause_button->Enable (_viewer->playing());
        _slider->Enable (!_current_disable_timeline);
        _spl_view->Enable (!_viewer->playing());
-       _next_button->Enable (!_current_disable_next_previous && can_do_next());
-       _previous_button->Enable (!_current_disable_next_previous && can_do_previous());
+       _next_button->Enable (!_current_disable_next && can_do_next());
+       _previous_button->Enable (can_do_previous());
 }
 
 void
@@ -271,6 +272,13 @@ SwaroopControls::add_playlist_to_list (SPL spl)
        _spl_view->InsertItem (it);
 }
 
+struct SPLComparator
+{
+       bool operator() (SPL const & a, SPL const & b) {
+               return a.name() < b.name();
+       }
+};
+
 void
 SwaroopControls::update_playlist_directory ()
 {
@@ -290,12 +298,18 @@ SwaroopControls::update_playlist_directory ()
                                SPL spl;
                                spl.read (i->path(), _content_view);
                                _playlists.push_back (spl);
-                               add_playlist_to_list (spl);
                        }
                } catch (exception& e) {
                        /* Never mind */
                }
        }
+
+       sort (_playlists.begin(), _playlists.end(), SPLComparator());
+       for (SPL i: _playlists) {
+               add_playlist_to_list (i);
+       }
+
+       _selected_playlist = boost::none;
 }
 
 void
@@ -335,6 +349,7 @@ SwaroopControls::spl_selection_changed ()
        _selected_playlist = selected;
        _selected_playlist_position = 0;
        reset_film ();
+       update_current_content ();
 }
 
 void
@@ -370,15 +385,17 @@ SwaroopControls::update_current_content ()
 {
        DCPOMATIC_ASSERT (_selected_playlist);
 
-       _viewer->stop ();
+       bool const was_playing = _viewer->stop ();
 
        SPLEntry const & e = _playlists[*_selected_playlist].get()[_selected_playlist_position];
        _current_disable_timeline = e.disable_timeline;
-       _current_disable_next_previous = e.skippable;
+       _current_disable_next = !e.skippable;
 
        setup_sensitivity ();
        reset_film ();
-       _viewer->start ();
+       if (was_playing) {
+               _viewer->start ();
+       }
 }
 
 void
@@ -388,5 +405,10 @@ SwaroopControls::viewer_finished ()
                return;
        }
 
-       next_clicked ();
+       _selected_playlist_position++;
+       if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) {
+               update_current_content ();
+       } else {
+               ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
+       }
 }