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

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index a8510cbbab38d4b3dd9776d268ffff24c5b13da0..e6950f7e7959eb09c5444b70178f612b06c8b22b 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -164,7 +164,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
        grid->Add (_filters_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
        ++r;
        
-       add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
+       _enable_colour_conversion = new wxCheckBox (this, wxID_ANY, _("Colour conversion"));
+       grid->Add (_enable_colour_conversion, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
        _colour_conversion = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
        grid->Add (_colour_conversion, wxGBPosition (r, 1), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
        _colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
@@ -201,6 +202,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
        
        _filters_button->Bind           (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
+       _enable_colour_conversion->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::enable_colour_conversion_clicked, this));
        _colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
 }
 
@@ -238,9 +240,21 @@ VideoPanel::film_content_changed (int property)
        } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
                setup_description ();
        } else if (property == VideoContentProperty::COLOUR_CONVERSION) {
-               optional<size_t> preset = vcs ? vcs->colour_conversion().preset () : optional<size_t> ();
-               vector<PresetColourConversion> cc = Config::instance()->colour_conversions ();
-               _colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
+               if (!vcs) {
+                       _colour_conversion->SetLabel (wxT (""));
+               } else if (vcs->colour_conversion ()) {
+                       optional<size_t> preset = vcs->colour_conversion().get().preset ();
+                       vector<PresetColourConversion> cc = Config::instance()->colour_conversions ();
+                       _colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
+                       _enable_colour_conversion->SetValue (true);
+                       _colour_conversion->Enable (true);
+                       _colour_conversion_button->Enable (true);
+               } else {
+                       _colour_conversion->SetLabel (_("None"));
+                       _enable_colour_conversion->SetValue (false);
+                       _colour_conversion->Enable (false);
+                       _colour_conversion_button->Enable (false);
+               }
        } else if (property == FFmpegContentProperty::FILTERS) {
                if (fcs) {
                        string const p = Filter::ffmpeg_string (fcs->filters ());
@@ -302,65 +316,14 @@ VideoPanel::setup_description ()
                return;
        }
 
-       shared_ptr<VideoContent> vcs = vc.front ();
-
-       wxString d;
-
-       int lines = 0;
-
-       if (vcs->video_size().width && vcs->video_size().height) {
-               d << wxString::Format (
-                       _("Content video is %dx%d (%.2f:1)\n"),
-                       vcs->video_size_after_3d_split().width,
-                       vcs->video_size_after_3d_split().height,
-                       vcs->video_size_after_3d_split().ratio ()
-                       );
-               ++lines;
-       }
-
-       Crop const crop = vcs->crop ();
-       if ((crop.left || crop.right || crop.top || crop.bottom) && vcs->video_size() != dcp::Size (0, 0)) {
-               dcp::Size cropped = vcs->video_size_after_crop ();
-               d << wxString::Format (
-                       _("Cropped to %dx%d (%.2f:1)\n"),
-                       cropped.width, cropped.height,
-                       cropped.ratio ()
-                       );
-               ++lines;
-       }
-
-       dcp::Size const container_size = _parent->film()->frame_size ();
-       dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size, 1);
-
-       if (scaled != vcs->video_size_after_crop ()) {
-               d << wxString::Format (
-                       _("Scaled to %dx%d (%.2f:1)\n"),
-                       scaled.width, scaled.height,
-                       scaled.ratio ()
-                       );
-               ++lines;
-       }
-       
-       if (scaled != container_size) {
-               d << wxString::Format (
-                       _("Padded with black to %dx%d (%.2f:1)\n"),
-                       container_size.width, container_size.height,
-                       container_size.ratio ()
-                       );
-               ++lines;
-       }
-
-       d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
-       ++lines;
-       FrameRateChange frc (vcs->video_frame_rate(), _parent->film()->video_frame_rate ());
-       d << std_to_wx (frc.description ()) << "\n";
-       ++lines;
+       string d = vc.front()->processing_description ();
+       size_t lines = count (d.begin(), d.end(), '\n');
 
        for (int i = lines; i < 6; ++i) {
-               d << wxT ("\n ");
+               d += "\n ";
        }
 
-       _description->SetLabel (d);
+       _description->SetLabel (std_to_wx (d));
        _sizer->Layout ();
 }
 
@@ -372,7 +335,11 @@ VideoPanel::edit_colour_conversion_clicked ()
                return;
        }
 
-       ColourConversion conversion = vc.front()->colour_conversion ();
+       if (!vc.front()->colour_conversion ()) {
+               return;
+       }
+
+       ColourConversion conversion = vc.front()->colour_conversion().get ();
        ContentColourConversionDialog* d = new ContentColourConversionDialog (this);
        d->set (conversion);
        d->ShowModal ();
@@ -424,3 +391,18 @@ VideoPanel::fade_out_changed ()
                (*i)->set_fade_out (_fade_out->get (_parent->film()->video_frame_rate ()));
        }
 }
+
+void
+VideoPanel::enable_colour_conversion_clicked ()
+{
+       VideoContentList vc = _parent->selected_video ();
+       if (vc.size() != 1) {
+               return;
+       }
+
+       if (_enable_colour_conversion->GetValue()) {
+               vc.front()->set_default_colour_conversion ();
+       } else {
+               vc.front()->unset_colour_conversion ();
+       }
+}