diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-02-04 00:48:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-02-04 00:48:22 +0000 |
| commit | d456e97975ad62d1adf585631b365aadace1507f (patch) | |
| tree | 2b267f188cc7a48024861a3912dbf581e27dac6b /src/wx | |
| parent | d344fb643df11cd8dcc766a5e3819d422493ab9f (diff) | |
swaroop: populate playlist after recovery from crash.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/swaroop_controls.cc | 11 | ||||
| -rw-r--r-- | src/wx/swaroop_controls.h | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc index f93cc66f1..d16f36132 100644 --- a/src/wx/swaroop_controls.cc +++ b/src/wx/swaroop_controls.cc @@ -135,8 +135,7 @@ SwaroopControls::check_restart () for (size_t i = 0; i < _playlists.size(); ++i) { if (_playlists[i].id() == id) { - _selected_playlist = i; - _selected_playlist_position = index; + select_playlist (i, index); update_current_content (); _viewer->seek (DCPTime(time), false); _viewer->start (); @@ -394,6 +393,12 @@ SwaroopControls::spl_selection_changed () return; } + select_playlist (selected, 0); +} + +void +SwaroopControls::select_playlist (int selected, int position) +{ log (wxString::Format("load-playlist %s", std_to_wx(_playlists[selected].name()).data())); wxProgressDialog dialog (_("DCP-o-matic"), "Loading playlist and KDMs"); @@ -438,7 +443,7 @@ SwaroopControls::spl_selection_changed () } _selected_playlist = selected; - _selected_playlist_position = 0; + _selected_playlist_position = position; dialog.Pulse (); reset_film (); dialog.Pulse (); diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h index e2c4190b6..8400d8cdb 100644 --- a/src/wx/swaroop_controls.h +++ b/src/wx/swaroop_controls.h @@ -47,6 +47,7 @@ private: void update_content_directory (); void update_playlist_directory (); void spl_selection_changed (); + void select_playlist (int selected, int position); void started (); void stopped (); void setup_sensitivity (); |