Put Time types in dcpomatic namespace.

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 605d4ff68e48852542a57647b4f39b5276f00b25..9c044e1889f51109517276899ef7350135a9aa26 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -51,6 +51,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
 
 static VideoContentScale
 index_to_scale (int n)
@@ -244,10 +245,6 @@ VideoPanel::add_to_grid ()
        _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
        r += 2;
 
-       _fade_in_label->Show (full);
-       _fade_in->Show (full);
-       _fade_out_label->Show (full);
-       _fade_out->Show (full);
        _scale_to_label->Show (full);
        _scale->show (full);
        _filters_label->Show (full);
@@ -257,15 +254,15 @@ VideoPanel::add_to_grid ()
        _colour_conversion->Show (full);
        _edit_colour_conversion_button->Show (full);
 
-       if (full) {
-               add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
-               _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
-               ++r;
+       add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
+       _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
+       ++r;
 
-               add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
-               _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
-               ++r;
+       add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
+       _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
+       ++r;
 
+       if (full) {
                add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0));
                _scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
                ++r;