Put Time types in dcpomatic namespace.

[dcpomatic.git] / src / wx / video_panel.h

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index a244d08b3152af083ac5e2e9ad088a8e2452d180..8e9a77cab97360c89f546cfb730227466b2e8f2f 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -27,7 +27,6 @@
 #include "timecode.h"
 #include "lib/video_content_scale.h"
 #include "lib/film.h"
-#include "lib/config.h"
 
 class wxChoice;
 class wxStaticText;
@@ -54,12 +53,10 @@ private:
        void fade_in_changed ();
        void fade_out_changed ();
        void add_to_grid ();
-       void config_changed (Config::Property p);
 
        void setup_description ();
        void setup_sensitivity ();
 
-       wxGridBagSizer* _grid;
        wxCheckBox* _reference;
        wxStaticText* _reference_note;
        wxStaticText* _type_label;
@@ -73,9 +70,9 @@ private:
        wxStaticText* _bottom_crop_label;
        ContentSpinCtrl<VideoContent>* _bottom_crop;
        wxStaticText* _fade_in_label;
-       Timecode<ContentTime>* _fade_in;
+       Timecode<dcpomatic::ContentTime>* _fade_in;
        wxStaticText* _fade_out_label;
-       Timecode<ContentTime>* _fade_out;
+       Timecode<dcpomatic::ContentTime>* _fade_out;
        wxStaticText* _scale_to_label;
        ContentChoice<VideoContent, VideoContentScale>* _scale;
        wxStaticText* _description;