X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=c405822be59d14c5c2b9bc0754adf7152c55cdf1;hb=c8be0644833dce6ff39202430bba0ab358f3e096;hp=aa0c6ed531af796a4fdc54df2c4f83e8b3957262;hpb=a4d8e5d24beddb719180e75f1047ae317bef85a4;p=dcpomatic.git diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h index aa0c6ed53..c405822be 100644 --- a/src/wx/video_panel.h +++ b/src/wx/video_panel.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -24,6 +25,7 @@ #include "content_sub_panel.h" #include "content_widget.h" #include "timecode.h" +#include "lib/video_content_scale.h" #include "lib/film.h" class wxChoice; @@ -44,13 +46,17 @@ public: void content_selection_changed (); private: + void reference_clicked (); void edit_filters_clicked (); + void colour_conversion_changed (); void edit_colour_conversion_clicked (); void fade_in_changed (); void fade_out_changed (); void setup_description (); + void setup_sensitivity (); + wxCheckBox* _reference; ContentChoice* _frame_type; ContentSpinCtrl* _left_crop; ContentSpinCtrl* _right_crop; @@ -62,6 +68,6 @@ private: wxStaticText* _description; wxStaticText* _filters; wxButton* _filters_button; - wxStaticText* _colour_conversion; - wxButton* _colour_conversion_button; + wxChoice* _colour_conversion; + wxButton* _edit_colour_conversion_button; };