X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fswaroop_controls.h;h=11dbcfc1013025fbec4329c65f91d702699e41ad;hb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;hp=2d0d14a67763b1437cb1baa8ae7f9017feeb2d0e;hpb=c7ae521e655354dd2f27766ee23766a0e698a89c;p=dcpomatic.git

diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
index 2d0d14a67..11dbcfc10 100644
--- a/src/wx/swaroop_controls.h
+++ b/src/wx/swaroop_controls.h
@@ -20,6 +20,9 @@
 
 #include "controls.h"
 
+class DCPContent;
+class EncryptedECinemaKDM;
+
 class SwaroopControls : public Controls
 {
 public:
@@ -27,6 +30,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
@@ -44,15 +48,23 @@ 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 ();
 	void config_changed (int);
 	void viewer_finished ();
+	void viewer_position_changed ();
 	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;
@@ -65,10 +77,9 @@ private:
 	wxListCtrl* _spl_view;
 	wxButton* _refresh_spl_view;
 	wxListCtrl* _current_spl_view;
-	wxTextCtrl* _log;
 
 	bool _current_disable_timeline;
-	bool _current_disable_next_previous;
+	bool _current_disable_next;
 
 	std::vector<SPL> _playlists;
 	boost::optional<int> _selected_playlist;