Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

diff --git a/cscript b/cscript
index f3387e78a3c8b35693d7606654b1b2828ec67c94..0beffc5ef8e516733bf57520d7788247c7bde2aa 100644 (file)
--- a/cscript
+++ b/cscript
@@ -156,7 +156,7 @@ def make_control(debian_version, bits, filename, debug):
 
 def dependencies(target):
     return (('ffmpeg-cdist', 'f69bb08'),
-            ('libdcp', 'fa1dddf'),
+            ('libdcp', '8f3587b'),
             ('libsub', 'f66b11f'))
 
 def build(target, options):

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index bc2faf1b30b27f07bbab39de2aac599457f31947..c4be761db876532442287a904e6c1c2082ee9f23 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -368,14 +368,17 @@ VideoPanel::content_selection_changed ()
        
        bool const single = video_sel.size() == 1;
 
+       _frame_type->set_content (video_sel);
        _left_crop->set_content (video_sel);
        _right_crop->set_content (video_sel);
        _top_crop->set_content (video_sel);
        _bottom_crop->set_content (video_sel);
-       _frame_type->set_content (video_sel);
+       _fade_in->Enable (!video_sel.empty ());
+       _fade_out->Enable (!video_sel.empty ());
        _scale->set_content (video_sel);
 
        _filters_button->Enable (single && !ffmpeg_sel.empty ());
+       _enable_colour_conversion->Enable (single);
        _colour_conversion_button->Enable (single);
 
        film_content_changed (VideoContentProperty::VIDEO_CROP);