Allow changing colour conversion settings for multiple pieces of content at the same...
[dcpomatic.git] / src / wx / video_panel.cc
index a2c35ec764e0094559da4241ecca952d352416ee..992ddf115b80455e063fe5674952b3f3bcaa73e4 100644 (file)
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,6 +24,9 @@
 #include "content_colour_conversion_dialog.h"
 #include "content_widget.h"
 #include "content_panel.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include "lib/filter.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/colour_conversion.h"
 #include "lib/ratio.h"
 #include "lib/frame_rate_change.h"
 #include "lib/dcp_content.h"
+#include "lib/video_content.h"
 #include <wx/spinctrl.h>
 #include <boost/foreach.hpp>
+#include <boost/unordered_set.hpp>
+#include <boost/functional/hash.hpp>
 #include <set>
 #include <iostream>
 
@@ -46,6 +53,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)
@@ -72,149 +80,117 @@ scale_to_index (VideoContentScale scale)
 VideoPanel::VideoPanel (ContentPanel* p)
        : ContentSubPanel (p, _("Video"))
 {
-       wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       _sizer->Add (grid, 0, wxALL, 8);
+       _reference = new CheckBox (this, _("Use this DCP's video as OV and make VF"));
+       _reference_note = new StaticText (this, wxT(""));
+       _reference_note->Wrap (200);
+       wxFont font = _reference_note->GetFont();
+       font.SetStyle(wxFONTSTYLE_ITALIC);
+       font.SetPointSize(font.GetPointSize() - 1);
+       _reference_note->SetFont(font);
 
-       int r = 0;
+       _use = new wxCheckBox (this, wxID_ANY, _("Use"));
 
-       _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP"));
-       grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
-       ++r;
-
-       add_label_to_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0));
+       _type_label = create_label (this, _("Type"), true);
        _frame_type = new ContentChoice<VideoContent, VideoFrameType> (
                this,
                new wxChoice (this, wxID_ANY),
-               VideoContentProperty::VIDEO_FRAME_TYPE,
-               boost::mem_fn (&VideoContent::video_frame_type),
-               boost::mem_fn (&VideoContent::set_video_frame_type),
+               VideoContentProperty::FRAME_TYPE,
+               &Content::video,
+               boost::mem_fn (&VideoContent::frame_type),
+               boost::mem_fn (&VideoContent::set_frame_type),
                &caster<int, VideoFrameType>,
                &caster<VideoFrameType, int>
                );
-       _frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
-       ++r;
-
-       add_label_to_sizer (grid, this, _("Crop"), true, wxGBPosition (r, 0));
-
-       int cr = 0;
-       wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-       add_label_to_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0));
+       _left_crop_label = create_label (this, _("Left crop"), true);
        _left_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::left_crop),
                boost::mem_fn (&VideoContent::set_left_crop)
                );
-       _left_crop->add (crop, wxGBPosition (cr, 1));
 
-       add_label_to_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2));
+       _right_crop_label = create_label (this, _("Right crop"), true);
        _right_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::right_crop),
                boost::mem_fn (&VideoContent::set_right_crop)
                );
-       _right_crop->add (crop, wxGBPosition (cr, 3));
 
-       ++cr;
-
-       add_label_to_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0));
+       _top_crop_label = create_label (this, _("Top crop"), true);
        _top_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::top_crop),
                boost::mem_fn (&VideoContent::set_top_crop)
                );
-       _top_crop->add (crop, wxGBPosition (cr, 1));
 
-       add_label_to_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2));
+       _bottom_crop_label = create_label (this, _("Bottom crop"), true);
        _bottom_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::bottom_crop),
                boost::mem_fn (&VideoContent::set_bottom_crop)
                );
-       _bottom_crop->add (crop, wxGBPosition (cr, 3));
-
-       grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3));
-       r += 2;
 
-       add_label_to_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0));
+       _fade_in_label = create_label (this, _("Fade in"), true);
        _fade_in = new Timecode<ContentTime> (this);
-       grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
-       ++r;
 
-       add_label_to_sizer (grid, this, _("Fade out"), true, wxGBPosition (r, 0));
+       _fade_out_label = create_label (this, _("Fade out"), true);
        _fade_out = new Timecode<ContentTime> (this);
-       grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
-       ++r;
 
-       add_label_to_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
+       _scale_to_label = create_label (this, _("Scale to"), true);
        _scale = new ContentChoice<VideoContent, VideoContentScale> (
                this,
                new wxChoice (this, wxID_ANY),
-               VideoContentProperty::VIDEO_SCALE,
+               VideoContentProperty::SCALE,
+               &Content::video,
                boost::mem_fn (&VideoContent::scale),
                boost::mem_fn (&VideoContent::set_scale),
                &index_to_scale,
                &scale_to_index
                );
-       _scale->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
-       ++r;
 
        wxClientDC dc (this);
        wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
        size.SetHeight (-1);
 
-       add_label_to_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0));
-       {
-               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-
-               _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
-               s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
-               _filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
-               s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
+       _filters_label = create_label (this, _("Filters"), true);
+       _filters = new StaticText (this, _("None"), wxDefaultPosition, size);
+       _filters_button = new Button (this, _("Edit..."));
 
-               grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+       _colour_conversion_label = create_label (this, _("Colour conversion"), true);
+       _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
+       _colour_conversion->Append (_("None"));
+       BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) {
+               _colour_conversion->Append (std_to_wx (i.name));
        }
-       ++r;
-
-       add_label_to_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
-       {
-               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-
-               _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
-               _colour_conversion->Append (_("None"));
-               BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) {
-                       _colour_conversion->Append (std_to_wx (i.name));
-               }
-               _colour_conversion->Append (_("Custom"));
-               s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
 
-               _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
-               s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+       /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
+       _colour_conversion->Append (S_("Colour|Custom"));
+       _edit_colour_conversion_button = new Button (this, _("Edit..."));
 
-               grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-       }
-       ++r;
+       _range_label = create_label (this, _("Range"), true);
+       _range = new wxChoice (this, wxID_ANY);
+       _range->Append (_("Full (JPEG, 0-255)"));
+       _range->Append (_("Video (MPEG, 16-235)"));
 
-       _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
-       grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
-       wxFont font = _description->GetFont();
-       font.SetStyle(wxFONTSTYLE_ITALIC);
-       font.SetPointSize(font.GetPointSize() - 1);
+       _description = new StaticText (this, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
        _description->SetFont(font);
-       ++r;
 
-       _left_crop->wrapped()->SetRange (0, 1024);
-       _top_crop->wrapped()->SetRange (0, 1024);
-       _right_crop->wrapped()->SetRange (0, 1024);
-       _bottom_crop->wrapped()->SetRange (0, 1024);
+       _left_crop->wrapped()->SetRange (0, 4096);
+       _top_crop->wrapped()->SetRange (0, 4096);
+       _right_crop->wrapped()->SetRange (0, 4096);
+       _bottom_crop->wrapped()->SetRange (0, 4096);
 
        _scale->wrapped()->Clear ();
        BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) {
@@ -222,74 +198,221 @@ VideoPanel::VideoPanel (ContentPanel* p)
        }
 
        _frame_type->wrapped()->Append (_("2D"));
+       _frame_type->wrapped()->Append (_("3D"));
        _frame_type->wrapped()->Append (_("3D left/right"));
        _frame_type->wrapped()->Append (_("3D top/bottom"));
        _frame_type->wrapped()->Append (_("3D alternate"));
        _frame_type->wrapped()->Append (_("3D left only"));
        _frame_type->wrapped()->Append (_("3D right only"));
 
+       content_selection_changed ();
+
        _fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
        _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
 
-       _reference->Bind                     (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::reference_clicked, this));
-       _filters_button->Bind                (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
-       _colour_conversion->Bind             (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::colour_conversion_changed, this));
-       _edit_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
+       _use->Bind                           (wxEVT_CHECKBOX, boost::bind (&VideoPanel::use_clicked, this));
+       _reference->Bind                     (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
+       _filters_button->Bind                (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_filters_clicked, this));
+       _colour_conversion->Bind             (wxEVT_CHOICE,   boost::bind (&VideoPanel::colour_conversion_changed, this));
+       _range->Bind                         (wxEVT_CHOICE,   boost::bind (&VideoPanel::range_changed, this));
+       _edit_colour_conversion_button->Bind (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
+
+       add_to_grid ();
+}
+
+void
+VideoPanel::add_to_grid ()
+{
+       bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
+
+       int r = 0;
+
+       _reference->Show (full);
+       _reference_note->Show (full && !_reference_note->GetLabel().IsEmpty());
+
+       if (full) {
+               wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+               reference_sizer->Add (_reference, 0);
+               reference_sizer->Add (_reference_note, 0);
+               _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3));
+               ++r;
+       }
+
+       _use->Show (full);
+       _grid->Add (_use, wxGBPosition(r, 0), wxGBSpan(1, 2));
+       ++r;
+
+       add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
+       _frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
+       ++r;
+
+       int cr = 0;
+       wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0));
+       _left_crop->add (crop, wxGBPosition (cr, 1));
+       add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 2));
+       _right_crop->add (crop, wxGBPosition (cr, 3));
+       ++cr;
+       add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0));
+       _top_crop->add (crop, wxGBPosition (cr, 1));
+       add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2));
+       _bottom_crop->add (crop, wxGBPosition (cr, 3));
+       _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
+       r += 2;
+
+       _scale_to_label->Show (full);
+       _scale->show (full);
+       _filters_label->Show (full);
+       _filters->Show (full);
+       _filters_button->Show (full);
+       _colour_conversion_label->Show (full);
+       _colour_conversion->Show (full);
+       _edit_colour_conversion_button->Show (full);
+       _range_label->Show (full);
+       _range->Show (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_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;
+
+               add_label_to_sizer (_grid, _filters_label, true, wxGBPosition (r, 0));
+               {
+                       wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+                       s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
+                       _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+               }
+               ++r;
+
+               add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
+               {
+                       wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+                       s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+                       _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+               }
+               ++r;
+
+               add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0));
+               _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
+               ++r;
+       }
+
+       _grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6);
+       ++r;
+}
+
+void
+VideoPanel::range_changed ()
+{
+       ContentList vc = _parent->selected_video ();
+       if (vc.size() != 1) {
+               return;
+       }
+
+       switch (_range->GetSelection()) {
+       case 0:
+               vc.front()->video->set_range (VIDEO_RANGE_FULL);
+               break;
+       case 1:
+               vc.front()->video->set_range (VIDEO_RANGE_VIDEO);
+               break;
+       default:
+               DCPOMATIC_ASSERT (false);
+       }
 }
 
+
 void
 VideoPanel::film_changed (Film::Property property)
 {
        switch (property) {
-       case Film::CONTAINER:
        case Film::VIDEO_FRAME_RATE:
+       case Film::CONTAINER:
        case Film::RESOLUTION:
                setup_description ();
+               setup_sensitivity ();
                break;
        case Film::REEL_TYPE:
+       case Film::INTEROP:
                setup_sensitivity ();
+               break;
        default:
                break;
        }
 }
 
+std::size_t
+hash_value (boost::optional<ColourConversion> const & c)
+{
+       boost::hash<string> hasher;
+       if (!c) {
+               return hasher ("none");
+       }
+       return hasher (c->identifier());
+}
+
+
 void
 VideoPanel::film_content_changed (int property)
 {
-       VideoContentList vc = _parent->selected_video ();
-       shared_ptr<VideoContent> vcs;
+       ContentList vc = _parent->selected_video ();
+       shared_ptr<Content> vcs;
        shared_ptr<FFmpegContent> fcs;
        if (!vc.empty ()) {
                vcs = vc.front ();
                fcs = dynamic_pointer_cast<FFmpegContent> (vcs);
        }
 
-       if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
-               setup_description ();
-       } else if (property == VideoContentProperty::VIDEO_CROP) {
-               setup_description ();
-       } else if (property == VideoContentProperty::VIDEO_SCALE) {
-               setup_description ();
-       } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
+       if (property == ContentProperty::VIDEO_FRAME_RATE ||
+           property == VideoContentProperty::FRAME_TYPE ||
+           property == VideoContentProperty::CROP ||
+           property == VideoContentProperty::SCALE) {
                setup_description ();
        } else if (property == VideoContentProperty::COLOUR_CONVERSION) {
-               if (!vcs) {
-                       checked_set (_colour_conversion, 0);
-                       _edit_colour_conversion_button->Enable (false);
-               } else if (vcs->colour_conversion ()) {
-                       optional<size_t> preset = vcs->colour_conversion().get().preset ();
-                       vector<PresetColourConversion> cc = PresetColourConversion::all ();
-                       if (preset) {
-                               checked_set (_colour_conversion, preset.get() + 1);
-                               _edit_colour_conversion_button->Enable (false);
+               boost::unordered_set<optional<ColourConversion> > check;
+               BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+                       check.insert (i->video->colour_conversion());
+               }
+
+               /* Remove any "Many" entry that we might have added previously.  There should
+                * be entries for each preset plus one for "None" and one for "Custom".
+                */
+               vector<PresetColourConversion> cc = PresetColourConversion::all ();
+               if (_colour_conversion->GetCount() > cc.size() + 2) {
+                       _colour_conversion->Delete (_colour_conversion->GetCount() - 1);
+               }
+
+               if (check.size() == 1) {
+                       if (vcs && vcs->video->colour_conversion ()) {
+                               optional<size_t> preset = vcs->video->colour_conversion().get().preset ();
+                               if (preset) {
+                                       checked_set (_colour_conversion, preset.get() + 1);
+                               } else {
+                                       checked_set (_colour_conversion, cc.size() + 1);
+                               }
                        } else {
-                               checked_set (_colour_conversion, cc.size() + 1);
-                               _edit_colour_conversion_button->Enable (true);
+                               checked_set (_colour_conversion, 0);
                        }
-               } else {
-                       checked_set (_colour_conversion, 0);
-                       _edit_colour_conversion_button->Enable (false);
+               } else if (check.size() > 1) {
+                       /* Add a "many" entry and select it as an indication that multiple different
+                        * colour conversions are present in the selection.
+                        */
+                       _colour_conversion->Append (_("Many"));
+                       checked_set (_colour_conversion, _colour_conversion->GetCount() - 1);
                }
+
+               setup_sensitivity ();
+
        } else if (property == FFmpegContentProperty::FILTERS) {
                if (fcs) {
                        string p = Filter::ffmpeg_string (fcs->filters ());
@@ -302,25 +425,44 @@ VideoPanel::film_content_changed (int property)
                                checked_set (_filters, p);
                        }
                }
-       } else if (property == VideoContentProperty::VIDEO_FADE_IN) {
+       } else if (property == VideoContentProperty::USE) {
+               set<bool> check;
+               BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+                       check.insert (i->video->use());
+               }
+
+               if (check.size() == 1) {
+                       checked_set (_use, vc.front()->video->use());
+               } else {
+                       checked_set (_use, false);
+               }
+
+               setup_sensitivity ();
+       } else if (property == VideoContentProperty::FADE_IN) {
                set<Frame> check;
-               BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
-                       check.insert (i->fade_in ());
+               BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+                       check.insert (i->video->fade_in ());
                }
 
                if (check.size() == 1) {
-                       _fade_in->set (ContentTime::from_frames (vc.front()->fade_in (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
+                       _fade_in->set (
+                               ContentTime::from_frames (vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())),
+                               vc.front()->active_video_frame_rate(_parent->film())
+                               );
                } else {
                        _fade_in->clear ();
                }
-       } else if (property == VideoContentProperty::VIDEO_FADE_OUT) {
+       } else if (property == VideoContentProperty::FADE_OUT) {
                set<Frame> check;
-               BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
-                       check.insert (i->fade_out ());
+               BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+                       check.insert (i->video->fade_out ());
                }
 
                if (check.size() == 1) {
-                       _fade_out->set (ContentTime::from_frames (vc.front()->fade_out (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
+                       _fade_out->set (
+                               ContentTime::from_frames (vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())),
+                               vc.front()->active_video_frame_rate(_parent->film())
+                               );
                } else {
                        _fade_out->clear ();
                }
@@ -332,6 +474,14 @@ VideoPanel::film_content_changed (int property)
                        checked_set (_reference, false);
                }
 
+               setup_sensitivity ();
+       } else if (property == VideoContentProperty::RANGE) {
+               if (vcs) {
+                       checked_set (_range, vcs->video->range() == VIDEO_RANGE_FULL ? 0 : 1);
+               } else {
+                       checked_set (_range, 0);
+               }
+
                setup_sensitivity ();
        }
 }
@@ -354,7 +504,7 @@ VideoPanel::edit_filters_clicked ()
 void
 VideoPanel::setup_description ()
 {
-       VideoContentList vc = _parent->selected_video ();
+       ContentList vc = _parent->selected_video ();
        if (vc.empty ()) {
                checked_set (_description, wxT (""));
                return;
@@ -363,7 +513,7 @@ VideoPanel::setup_description ()
                return;
        }
 
-       string d = vc.front()->processing_description ();
+       string d = vc.front()->video->processing_description (_parent->film());
        size_t lines = count (d.begin(), d.end(), '\n');
 
        for (int i = lines; i < 6; ++i) {
@@ -377,42 +527,46 @@ VideoPanel::setup_description ()
 void
 VideoPanel::colour_conversion_changed ()
 {
-       VideoContentList vc = _parent->selected_video ();
-       if (vc.size() != 1) {
-               return;
-       }
+       ContentList vc = _parent->selected_video ();
 
        int const s = _colour_conversion->GetSelection ();
        vector<PresetColourConversion> all = PresetColourConversion::all ();
 
-       if (s == 0) {
-               vc.front()->unset_colour_conversion ();
-       } else if (s == int (all.size() + 1)) {
+       if (s == int(all.size() + 1)) {
                edit_colour_conversion_clicked ();
        } else {
-               vc.front()->set_colour_conversion (all[s - 1].conversion);
+               BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
+                       if (s == 0) {
+                               i->video->unset_colour_conversion ();
+                       } else if (s != int(all.size() + 2)) {
+                               i->video->set_colour_conversion (all[s - 1].conversion);
+                       }
+               }
        }
 }
 
 void
 VideoPanel::edit_colour_conversion_clicked ()
 {
-       VideoContentList vc = _parent->selected_video ();
-       if (vc.size() != 1) {
-               return;
-       }
+       ContentList vc = _parent->selected_video ();
 
-       ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->yuv ());
-       d->set (vc.front()->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion));
-       d->ShowModal ();
-       vc.front()->set_colour_conversion (d->get ());
+       ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ());
+       d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion));
+       if (d->ShowModal() == wxID_OK) {
+               BOOST_FOREACH (shared_ptr<Content> i, vc) {
+                       i->video->set_colour_conversion (d->get ());
+               }
+       } else {
+               /* Reset the colour conversion choice */
+               film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
+       }
        d->Destroy ();
 }
 
 void
 VideoPanel::content_selection_changed ()
 {
-       VideoContentList video_sel = _parent->selected_video ();
+       ContentList video_sel = _parent->selected_video ();
 
        _frame_type->set_content (video_sel);
        _left_crop->set_content (video_sel);
@@ -421,11 +575,13 @@ VideoPanel::content_selection_changed ()
        _bottom_crop->set_content (video_sel);
        _scale->set_content (video_sel);
 
-       film_content_changed (VideoContentProperty::VIDEO_CROP);
-       film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+       film_content_changed (ContentProperty::VIDEO_FRAME_RATE);
+       film_content_changed (VideoContentProperty::CROP);
        film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
-       film_content_changed (VideoContentProperty::VIDEO_FADE_IN);
-       film_content_changed (VideoContentProperty::VIDEO_FADE_OUT);
+       film_content_changed (VideoContentProperty::FADE_IN);
+       film_content_changed (VideoContentProperty::FADE_OUT);
+       film_content_changed (VideoContentProperty::RANGE);
+       film_content_changed (VideoContentProperty::USE);
        film_content_changed (FFmpegContentProperty::FILTERS);
        film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
 
@@ -442,20 +598,21 @@ VideoPanel::setup_sensitivity ()
                dcp = dynamic_pointer_cast<DCPContent> (sel.front ());
        }
 
-       list<string> why_not;
-       bool const can_reference = dcp && dcp->can_reference_video(why_not);
-       _reference->Enable (can_reference);
-
-       wxString s;
-       if (!can_reference) {
-               s = _("Cannot reference this DCP.  ");
-               BOOST_FOREACH (string i, why_not) {
-                       s += std_to_wx(i) + wxT("  ");
-               }
+       string why_not;
+       bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not);
+       wxString cannot;
+       if (why_not.empty()) {
+               cannot = _("Cannot reference this DCP's video.");
+       } else {
+               cannot = _("Cannot reference this DCP's video: ") + std_to_wx(why_not);
        }
-       _reference->SetToolTip (s);
+       setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
+
+       bool const enable = !_reference->GetValue() && _use->GetValue();
 
-       if (_reference->GetValue ()) {
+       _use->Enable (!_reference->GetValue());
+
+       if (!enable) {
                _frame_type->wrapped()->Enable (false);
                _left_crop->wrapped()->Enable (false);
                _right_crop->wrapped()->Enable (false);
@@ -468,9 +625,9 @@ VideoPanel::setup_sensitivity ()
                _filters->Enable (false);
                _filters_button->Enable (false);
                _colour_conversion->Enable (false);
-               _edit_colour_conversion_button->Enable (false);
+               _range->Enable (false);
        } else {
-               VideoContentList video_sel = _parent->selected_video ();
+               ContentList video_sel = _parent->selected_video ();
                FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
                bool const single = video_sel.size() == 1;
 
@@ -485,26 +642,46 @@ VideoPanel::setup_sensitivity ()
                _description->Enable (true);
                _filters->Enable (true);
                _filters_button->Enable (single && !ffmpeg_sel.empty ());
-               _colour_conversion->Enable (single && !video_sel.empty ());
-               _edit_colour_conversion_button->Enable (true);
+               _colour_conversion->Enable (!video_sel.empty());
+               _range->Enable (single && !video_sel.empty());
+       }
+
+       ContentList vc = _parent->selected_video ();
+       shared_ptr<Content> vcs;
+       if (!vc.empty ()) {
+               vcs = vc.front ();
+       }
+
+       if (vcs && vcs->video->colour_conversion ()) {
+               _edit_colour_conversion_button->Enable (!vcs->video->colour_conversion().get().preset());
+       } else {
+               _edit_colour_conversion_button->Enable (false);
        }
 }
 
 void
 VideoPanel::fade_in_changed ()
 {
-       BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
-               int const vfr = _parent->film()->video_frame_rate ();
-               i->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
+       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
+               double const vfr = i->active_video_frame_rate (_parent->film());
+               i->video->set_fade_in (_fade_in->get(vfr).frames_round(vfr));
        }
 }
 
 void
 VideoPanel::fade_out_changed ()
 {
-       BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
-               int const vfr = _parent->film()->video_frame_rate ();
-               i->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
+       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
+               double const vfr = i->active_video_frame_rate (_parent->film());
+               i->video->set_fade_out (_fade_out->get(vfr).frames_round(vfr));
+       }
+}
+
+void
+VideoPanel::use_clicked ()
+{
+       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
+               i->video->set_use (_use->GetValue());
        }
 }