X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplaylist_controls.h;h=b0d04f4cb28caac81d5d2cb0cc508b1cbf2a1a0d;hb=92933c13e9233149e4e80244d92da81b70072214;hp=dd6b77788e147c6a11444208c29b17dfaa69171f;hpb=b24104d631b8c6f44d95f28e2ff3bc608cb221a7;p=dcpomatic.git diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h index dd6b77788..b0d04f4cb 100644 --- a/src/wx/playlist_controls.h +++ b/src/wx/playlist_controls.h @@ -26,16 +26,19 @@ class DCPContent; class PlaylistControls : public Controls { public: - PlaylistControls (wxWindow* parent, boost::shared_ptr viewer); + PlaylistControls (wxWindow* parent, std::shared_ptr viewer); void log (wxString s); - void set_film (boost::shared_ptr film); + void set_film (std::shared_ptr film); /** This is so that we can tell our parent player to reset the film when we have created one from a SPL. We could call a method in the player's DOMFrame but we don't have that in a header. */ - boost::signals2::signal)> ResetFilm; + boost::signals2::signal)> ResetFilm; + + void play (); + void stop (); private: void play_clicked (); @@ -59,7 +62,7 @@ private: bool can_do_next (); void deselect_playlist (); - boost::optional get_kdm_from_directory (boost::shared_ptr dcp); + boost::optional get_kdm_from_directory (std::shared_ptr dcp); wxButton* _play_button; wxButton* _pause_button; @@ -76,6 +79,4 @@ private: std::vector _playlists; boost::optional _selected_playlist; int _selected_playlist_position; - - wxTimer _timer; };