X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplaylist_controls.cc;h=56ff5f40d1ce7235abd83083dea1b8c3f38311f4;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=edc4485e66cba8095a5e677941a634132d6508f9;hpb=3e3e8433842820ce6380e8f5c1917ae1a28e2e57;p=dcpomatic.git diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index edc4485e6..56ff5f40d 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -40,8 +40,8 @@ using std::string; using std::cout; using std::exception; using std::sort; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using namespace dcpomatic; @@ -52,7 +52,6 @@ PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr vie , _stop_button (new Button(this, _("Stop"))) , _next_button (new Button(this, "Next")) , _previous_button (new Button(this, "Previous")) - , _timer (this) { _button_sizer->Add (_previous_button, 0, wxEXPAND); _button_sizer->Add (_play_button, 0, wxEXPAND); @@ -455,7 +454,6 @@ PlaylistControls::viewer_finished () } } -#ifdef DCPOMATIC_PLAYER_STRESS_TEST void PlaylistControls::play () { @@ -467,4 +465,3 @@ PlaylistControls::stop () { stop_clicked (); } -#endif