X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fswaroop_controls.h;h=f773bf901f74fd6d4046142ae1772ead46d2c667;hb=4e841ab275143ecbd8790c39ed332e5e346733f8;hp=e2c4190b66520639228f58204acbaa6e81318e37;hpb=12b1a3f10ee0e14691e68784bfccc7359d44b0a4;p=dcpomatic.git

diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
index e2c4190b6..f773bf901 100644
--- a/src/wx/swaroop_controls.h
+++ b/src/wx/swaroop_controls.h
@@ -19,8 +19,10 @@
 */
 
 #include "controls.h"
+#include "lib/swaroop_spl.h"
 
 class DCPContent;
+class EncryptedECinemaKDM;
 
 class SwaroopControls : public Controls
 {
@@ -47,19 +49,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 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;
@@ -72,7 +78,6 @@ private:
 	wxListCtrl* _spl_view;
 	wxButton* _refresh_spl_view;
 	wxListCtrl* _current_spl_view;
-	wxTextCtrl* _log;
 
 	bool _current_disable_timeline;
 	bool _current_disable_next;
@@ -80,4 +85,6 @@ private:
 	std::vector<SPL> _playlists;
 	boost::optional<int> _selected_playlist;
 	int _selected_playlist_position;
+
+	wxTimer _timer;
 };