projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I said we were in string freeze, but only nl_NL has come in so
[dcpomatic.git]
/
src
/
wx
/
swaroop_controls.h
diff --git
a/src/wx/swaroop_controls.h
b/src/wx/swaroop_controls.h
index 2d0d14a67763b1437cb1baa8ae7f9017feeb2d0e..8400d8cdb573e036cf3314866a783db8fea018ca 100644
(file)
--- a/
src/wx/swaroop_controls.h
+++ b/
src/wx/swaroop_controls.h
@@
-20,6
+20,8
@@
#include "controls.h"
#include "controls.h"
+class DCPContent;
+
class SwaroopControls : public Controls
{
public:
class SwaroopControls : public Controls
{
public:
@@
-27,6
+29,7
@@
public:
void log (wxString s);
void set_film (boost::shared_ptr<Film> film);
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
/** 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,16
+47,21
@@
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 config_changed (int);
void viewer_finished ();
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 reset_film ();
void update_current_content ();
bool can_do_previous ();
bool can_do_next ();
+ 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);
+
wxButton* _play_button;
wxButton* _pause_button;
wxButton* _stop_button;
wxButton* _play_button;
wxButton* _pause_button;
wxButton* _stop_button;
@@
-68,7
+76,7
@@
private:
wxTextCtrl* _log;
bool _current_disable_timeline;
wxTextCtrl* _log;
bool _current_disable_timeline;
- bool _current_disable_next
_previous
;
+ bool _current_disable_next;
std::vector<SPL> _playlists;
boost::optional<int> _selected_playlist;
std::vector<SPL> _playlists;
boost::optional<int> _selected_playlist;