X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplaylist_controls.h;h=bc283f288db3936fa6dd5b740c5a52b4863571f8;hb=7861a2f4fe15952d43323a64284afd71427d09f4;hp=dd6b77788e147c6a11444208c29b17dfaa69171f;hpb=b24104d631b8c6f44d95f28e2ff3bc608cb221a7;p=dcpomatic.git

diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h
index dd6b77788..bc283f288 100644
--- a/src/wx/playlist_controls.h
+++ b/src/wx/playlist_controls.h
@@ -18,24 +18,29 @@
 
 */
 
+
 #include "controls.h"
 #include "lib/spl.h"
 
+
 class DCPContent;
 
+
 class PlaylistControls : public Controls
 {
 public:
-	PlaylistControls (wxWindow* parent, boost::shared_ptr<FilmViewer> viewer);
+	PlaylistControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer);
 
-	void log (wxString s);
-	void set_film (boost::shared_ptr<Film> film);
+	void set_film (std::shared_ptr<Film> film) override;
 
 	/** 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<void (boost::weak_ptr<Film>)> ResetFilm;
+	boost::signals2::signal<void (std::weak_ptr<Film>)> ResetFilm;
+
+	void play () override;
+	void stop () override;
 
 private:
 	void play_clicked ();
@@ -48,10 +53,10 @@ private:
 	void update_playlist_directory ();
 	void spl_selection_changed ();
 	void select_playlist (int selected, int position);
-	void started ();
-	void stopped ();
-	void setup_sensitivity ();
-	void config_changed (int);
+	void started () override;
+	void stopped () override;
+	void setup_sensitivity () override;
+	void config_changed (int) override;
 	void viewer_finished ();
 	void reset_film ();
 	void update_current_content ();
@@ -59,7 +64,7 @@ private:
 	bool can_do_next ();
 	void deselect_playlist ();
 
-	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (boost::shared_ptr<DCPContent> dcp);
+	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (std::shared_ptr<DCPContent> dcp);
 
 	wxButton* _play_button;
 	wxButton* _pause_button;
@@ -76,6 +81,4 @@ private:
 	std::vector<SPL> _playlists;
 	boost::optional<int> _selected_playlist;
 	int _selected_playlist_position;
-
-	wxTimer _timer;
 };