X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.h;h=99633491d835ea9948538ad696459035e5f16876;hb=8d70790bda099158cfd9058998dba76ec78f83fa;hp=2ecf3c87f449135756c21e280c439cc63abeb6ce;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h index 2ecf3c87f..99633491d 100644 --- a/src/wx/video_panel.h +++ b/src/wx/video_panel.h @@ -19,6 +19,7 @@ #include "lib/film.h" #include "film_editor_panel.h" +#include "content_widget.h" class wxChoice; class wxStaticText; @@ -31,27 +32,21 @@ public: VideoPanel (FilmEditor *); void film_changed (Film::Property); - void film_content_changed (boost::shared_ptr, int); + void film_content_changed (int); + void content_selection_changed (); private: - void left_crop_changed (); - void right_crop_changed (); - void top_crop_changed (); - void bottom_crop_changed (); void edit_filters_clicked (); - void ratio_changed (); - void frame_type_changed (); void edit_colour_conversion_clicked (); void setup_description (); - wxChoice* _frame_type; - wxSpinCtrl* _left_crop; - wxSpinCtrl* _right_crop; - wxSpinCtrl* _top_crop; - wxSpinCtrl* _bottom_crop; - wxChoice* _ratio; - wxStaticText* _ratio_description; + ContentChoice* _frame_type; + ContentSpinCtrl* _left_crop; + ContentSpinCtrl* _right_crop; + ContentSpinCtrl* _top_crop; + ContentSpinCtrl* _bottom_crop; + ContentChoice* _scale; wxStaticText* _description; wxStaticText* _filters; wxButton* _filters_button;