projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
video_panel.h
diff --git
a/src/wx/video_panel.h
b/src/wx/video_panel.h
index aa0c6ed531af796a4fdc54df2c4f83e8b3957262..28d6aa4bbf6b6d8118cd88784ce799066bd7157c 100644
(file)
--- a/
src/wx/video_panel.h
+++ b/
src/wx/video_panel.h
@@
-45,6
+45,7
@@
public:
private:
void edit_filters_clicked ();
private:
void edit_filters_clicked ();
+ void enable_colour_conversion_clicked ();
void edit_colour_conversion_clicked ();
void fade_in_changed ();
void fade_out_changed ();
void edit_colour_conversion_clicked ();
void fade_in_changed ();
void fade_out_changed ();
@@
-62,6
+63,7
@@
private:
wxStaticText* _description;
wxStaticText* _filters;
wxButton* _filters_button;
wxStaticText* _description;
wxStaticText* _filters;
wxButton* _filters_button;
+ wxCheckBox* _enable_colour_conversion;
wxStaticText* _colour_conversion;
wxButton* _colour_conversion_button;
};
wxStaticText* _colour_conversion;
wxButton* _colour_conversion_button;
};