projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some missing checks for allocation failures.
[dcpomatic.git]
/
src
/
wx
/
swaroop_controls.h
diff --git
a/src/wx/swaroop_controls.h
b/src/wx/swaroop_controls.h
index 10919b7678e8f146eb37a136542dde90bac07354..f773bf901f74fd6d4046142ae1772ead46d2c667 100644
(file)
--- a/
src/wx/swaroop_controls.h
+++ b/
src/wx/swaroop_controls.h
@@
-19,6
+19,7
@@
*/
#include "controls.h"
*/
#include "controls.h"
+#include "lib/swaroop_spl.h"
class DCPContent;
class EncryptedECinemaKDM;
class DCPContent;
class EncryptedECinemaKDM;
@@
-54,12
+55,13
@@
private:
void setup_sensitivity ();
void config_changed (int);
void viewer_finished ();
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 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<dcp::EncryptedKDM> get_kdm_from_url (boost::shared_ptr<DCPContent> dcp);
boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (boost::shared_ptr<DCPContent> dcp);
@@
-76,7
+78,6
@@
private:
wxListCtrl* _spl_view;
wxButton* _refresh_spl_view;
wxListCtrl* _current_spl_view;
wxListCtrl* _spl_view;
wxButton* _refresh_spl_view;
wxListCtrl* _current_spl_view;
- wxTextCtrl* _log;
bool _current_disable_timeline;
bool _current_disable_next;
bool _current_disable_timeline;
bool _current_disable_next;
@@
-84,4
+85,6
@@
private:
std::vector<SPL> _playlists;
boost::optional<int> _selected_playlist;
int _selected_playlist_position;
std::vector<SPL> _playlists;
boost::optional<int> _selected_playlist;
int _selected_playlist_position;
+
+ wxTimer _timer;
};
};