projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
controls.h
diff --git
a/src/wx/controls.h
b/src/wx/controls.h
index a7e32179c33d4830c39e0891e0e8cf5bb89f94cb..75bae9bb3877635f50e02f27aa67fdb48baca83f 100644
(file)
--- a/
src/wx/controls.h
+++ b/
src/wx/controls.h
@@
-23,9
+23,9
@@
#define DCPOMATIC_CONTROLS_H
#define DCPOMATIC_CONTROLS_H
+#include "lib/change_signaller.h"
#include "lib/dcpomatic_time.h"
#include "lib/dcpomatic_time.h"
-#include "lib/film.h"
-#include "lib/types.h"
+#include "lib/film_property.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
@@
-33,6
+33,7
@@
LIBDCP_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+class CheckBox;
class ClosedCaptionsDialog;
class Content;
class ContentView;
class ClosedCaptionsDialog;
class Content;
class ContentView;
@@
-59,7
+60,7
@@
public:
bool editor_controls = true
);
bool editor_controls = true
);
- v
irtual v
oid set_film (std::shared_ptr<Film> film);
+ void set_film (std::shared_ptr<Film> film);
virtual void play () {};
virtual void stop () {};
virtual void play () {};
virtual void stop () {};
@@
-102,15
+103,15
@@
private:
void outline_content_changed ();
void eye_changed ();
void update_position ();
void outline_content_changed ();
void eye_changed ();
void update_position ();
- void film_change
(ChangeType, Film::
Property);
+ void film_change
(ChangeType, Film
Property);
typedef std::pair<std::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
typedef std::pair<std::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
- bool _slider_being_moved;
+ bool _slider_being_moved
= false
;
-
wxCheckBox* _outline_content
;
- wxChoice* _eye;
-
wxCheckBox* _jump_to_selected
;
+
CheckBox* _outline_content = nullptr
;
+ wxChoice* _eye
= nullptr
;
+
CheckBox* _jump_to_selected = nullptr
;
wxButton* _rewind_button;
wxButton* _back_button;
wxButton* _forward_button;
wxButton* _rewind_button;
wxButton* _back_button;
wxButton* _forward_button;