projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Windows #include.
[dcpomatic.git]
/
src
/
wx
/
swaroop_controls.h
diff --git
a/src/wx/swaroop_controls.h
b/src/wx/swaroop_controls.h
index e2c4190b66520639228f58204acbaa6e81318e37..1f740d2283825c7164212e1d954adce40ff71f33 100644
(file)
--- a/
src/wx/swaroop_controls.h
+++ b/
src/wx/swaroop_controls.h
@@
-21,6
+21,7
@@
#include "controls.h"
class DCPContent;
#include "controls.h"
class DCPContent;
+class EncryptedECinemaKDM;
class SwaroopControls : public Controls
{
class SwaroopControls : public Controls
{
@@
-47,6
+48,7
@@
private:
void update_content_directory ();
void update_playlist_directory ();
void spl_selection_changed ();
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 started ();
void stopped ();
void setup_sensitivity ();
@@
-60,6
+62,7
@@
private:
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<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* _play_button;
wxButton* _pause_button;