X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fswaroop_controls.h;h=f773bf901f74fd6d4046142ae1772ead46d2c667;hb=90b78d5477e4ca51b96cd22e7e81de50da486132;hp=bd39f556dae9e83e526c167a03906a4649da618a;hpb=fd3ba4d4bccbddaf626271d0743a6a9845b351f0;p=dcpomatic.git

diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
index bd39f556d..f773bf901 100644
--- a/src/wx/swaroop_controls.h
+++ b/src/wx/swaroop_controls.h
@@ -19,6 +19,10 @@
 */
 
 #include "controls.h"
+#include "lib/swaroop_spl.h"
+
+class DCPContent;
+class EncryptedECinemaKDM;
 
 class SwaroopControls : public Controls
 {
@@ -27,6 +31,7 @@ public:
 
 	void log (wxString s);
 	void set_film (boost::shared_ptr<Film> film);
+	void check_restart ();
 
 	/** 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
@@ -38,29 +43,48 @@ private:
 	void play_clicked ();
 	void pause_clicked ();
 	void stop_clicked ();
+	void next_clicked ();
+	void previous_clicked ();
 	void add_playlist_to_list (SPL spl);
 	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 ();
-	void image_changed (boost::weak_ptr<PlayerVideo> weak_pv);
 	void config_changed (int);
+	void viewer_finished ();
+	void write_position ();
+	void reset_film ();
+	void update_current_content ();
+	bool can_do_previous ();
+	bool can_do_next ();
+	void decrement_allowed_shows ();
+	void deselect_playlist ();
+
+	boost::optional<dcp::EncryptedKDM> get_kdm_from_url (boost::shared_ptr<DCPContent> dcp);
+	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (boost::shared_ptr<DCPContent> dcp);
+	boost::optional<EncryptedECinemaKDM> get_kdm_from_directory (boost::shared_ptr<FFmpegContent> ffmpeg);
 
 	wxButton* _play_button;
 	wxButton* _pause_button;
 	wxButton* _stop_button;
+	wxButton* _next_button;
+	wxButton* _previous_button;
 
 	ContentView* _content_view;
+	wxButton* _refresh_content_view;
 	wxListCtrl* _spl_view;
+	wxButton* _refresh_spl_view;
 	wxListCtrl* _current_spl_view;
-	wxTextCtrl* _log;
 
-	boost::weak_ptr<Content> _current_content;
-	boost::optional<dcp::ContentKind> _current_kind;
 	bool _current_disable_timeline;
+	bool _current_disable_next;
 
 	std::vector<SPL> _playlists;
 	boost::optional<int> _selected_playlist;
+	int _selected_playlist_position;
+
+	wxTimer _timer;
 };