X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=dd9bb58489dfadac1a6f93ac610c3c416db36fa2;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=e6950f7e7959eb09c5444b70178f612b06c8b22b;hpb=009e4abb14cfcaecc0de8fab179adc7bd5feffd4;p=dcpomatic.git

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index e6950f7e7..dd9bb5848 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,12 @@
 
 */
 
-#include <wx/spinctrl.h>
+#include "filter_dialog.h"
+#include "video_panel.h"
+#include "wx_util.h"
+#include "content_colour_conversion_dialog.h"
+#include "content_widget.h"
+#include "content_panel.h"
 #include "lib/filter.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/colour_conversion.h"
@@ -25,12 +30,11 @@
 #include "lib/util.h"
 #include "lib/ratio.h"
 #include "lib/frame_rate_change.h"
-#include "filter_dialog.h"
-#include "video_panel.h"
-#include "wx_util.h"
-#include "content_colour_conversion_dialog.h"
-#include "content_widget.h"
-#include "content_panel.h"
+#include "lib/dcp_content.h"
+#include <wx/spinctrl.h>
+#include <boost/foreach.hpp>
+#include <set>
+#include <iostream>
 
 using std::vector;
 using std::string;
@@ -47,8 +51,8 @@ static VideoContentScale
 index_to_scale (int n)
 {
 	vector<VideoContentScale> scales = VideoContentScale::all ();
-	assert (n >= 0);
-	assert (n < int (scales.size ()));
+	DCPOMATIC_ASSERT (n >= 0);
+	DCPOMATIC_ASSERT (n < int (scales.size ()));
 	return scales[n];
 }
 
@@ -62,7 +66,7 @@ scale_to_index (VideoContentScale scale)
 		}
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 }
 
 VideoPanel::VideoPanel (ContentPanel* p)
@@ -73,6 +77,10 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
 	int r = 0;
 
+	_reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP"));
+	grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
 	add_label_to_grid_bag_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0));
 	_frame_type = new ContentChoice<VideoContent, VideoFrameType> (
 		this,
@@ -85,8 +93,13 @@ VideoPanel::VideoPanel (ContentPanel* p)
 		);
 	_frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
 	++r;
-	
-	add_label_to_grid_bag_sizer (grid, this, _("Left crop"), true, wxGBPosition (r, 0));
+
+	add_label_to_grid_bag_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_grid_bag_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0));
 	_left_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -94,9 +107,9 @@ VideoPanel::VideoPanel (ContentPanel* p)
 		boost::mem_fn (&VideoContent::left_crop),
 		boost::mem_fn (&VideoContent::set_left_crop)
 		);
-	_left_crop->add (grid, wxGBPosition (r, 1));
+	_left_crop->add (crop, wxGBPosition (cr, 1));
 
-	add_label_to_grid_bag_sizer (grid, this, _("Right crop"), true, wxGBPosition (r, 2));
+	add_label_to_grid_bag_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2));
 	_right_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -104,11 +117,11 @@ VideoPanel::VideoPanel (ContentPanel* p)
 		boost::mem_fn (&VideoContent::right_crop),
 		boost::mem_fn (&VideoContent::set_right_crop)
 		);
-	_right_crop->add (grid, wxGBPosition (r, 3));
-	
-	++r;
-	
-	add_label_to_grid_bag_sizer (grid, this, _("Top crop"), true, wxGBPosition (r, 0));
+	_right_crop->add (crop, wxGBPosition (cr, 3));
+
+	++cr;
+
+	add_label_to_grid_bag_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0));
 	_top_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -116,9 +129,9 @@ VideoPanel::VideoPanel (ContentPanel* p)
 		boost::mem_fn (&VideoContent::top_crop),
 		boost::mem_fn (&VideoContent::set_top_crop)
 		);
-	_top_crop->add (grid, wxGBPosition (r, 1));
-	
-	add_label_to_grid_bag_sizer (grid, this, _("Bottom crop"), true, wxGBPosition (r, 2));
+	_top_crop->add (crop, wxGBPosition (cr, 1));
+
+	add_label_to_grid_bag_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2));
 	_bottom_crop = new ContentSpinCtrl<VideoContent> (
 		this,
 		new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
@@ -126,9 +139,10 @@ VideoPanel::VideoPanel (ContentPanel* p)
 		boost::mem_fn (&VideoContent::bottom_crop),
 		boost::mem_fn (&VideoContent::set_bottom_crop)
 		);
-	_bottom_crop->add (grid, wxGBPosition (r, 3));
-	
-	++r;
+	_bottom_crop->add (crop, wxGBPosition (cr, 3));
+
+	grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3));
+	r += 2;
 
 	add_label_to_grid_bag_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0));
 	_fade_in = new Timecode<ContentTime> (this);
@@ -139,7 +153,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_fade_out = new Timecode<ContentTime> (this);
 	grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
 	++r;
-	
+
 	add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
 	_scale = new ContentChoice<VideoContent, VideoContentScale> (
 		this,
@@ -156,20 +170,37 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	wxClientDC dc (this);
 	wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
 	size.SetHeight (-1);
-	
+
 	add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0));
-	_filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
-	grid->Add (_filters, wxGBPosition (r, 1), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
-	_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
-	grid->Add (_filters_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	{
+		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);
+
+		grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	}
 	++r;
-	
-	_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..."));
-	grid->Add (_colour_conversion_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+
+	add_label_to_grid_bag_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);
+
+		grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	}
 	++r;
 
 	_description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
@@ -185,10 +216,9 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_right_crop->wrapped()->SetRange (0, 1024);
 	_bottom_crop->wrapped()->SetRange (0, 1024);
 
-	vector<VideoContentScale> scales = VideoContentScale::all ();
 	_scale->wrapped()->Clear ();
-	for (vector<VideoContentScale>::iterator i = scales.begin(); i != scales.end(); ++i) {
-		_scale->wrapped()->Append (std_to_wx (i->name ()));
+	BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) {
+		_scale->wrapped()->Append (std_to_wx (i.name ()));
 	}
 
 	_frame_type->wrapped()->Append (_("2D"));
@@ -200,10 +230,11 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
 	_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
 	_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));
+
+	_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));
 }
 
 void
@@ -230,7 +261,7 @@ VideoPanel::film_content_changed (int property)
 		vcs = vc.front ();
 		fcs = dynamic_pointer_cast<FFmpegContent> (vcs);
 	}
-	
+
 	if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
 		setup_description ();
 	} else if (property == VideoContentProperty::VIDEO_CROP) {
@@ -241,51 +272,65 @@ VideoPanel::film_content_changed (int property)
 		setup_description ();
 	} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
 		if (!vcs) {
-			_colour_conversion->SetLabel (wxT (""));
+			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 = 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);
+			vector<PresetColourConversion> cc = PresetColourConversion::all ();
+			if (preset) {
+				checked_set (_colour_conversion, preset.get() + 1);
+				_edit_colour_conversion_button->Enable (false);
+			} else {
+				checked_set (_colour_conversion, cc.size() + 1);
+				_edit_colour_conversion_button->Enable (true);
+			}
 		} else {
-			_colour_conversion->SetLabel (_("None"));
-			_enable_colour_conversion->SetValue (false);
-			_colour_conversion->Enable (false);
-			_colour_conversion_button->Enable (false);
+			checked_set (_colour_conversion, 0);
+			_edit_colour_conversion_button->Enable (false);
 		}
 	} else if (property == FFmpegContentProperty::FILTERS) {
 		if (fcs) {
-			string const p = Filter::ffmpeg_string (fcs->filters ());
+			string p = Filter::ffmpeg_string (fcs->filters ());
 			if (p.empty ()) {
-				_filters->SetLabel (_("None"));
+				checked_set (_filters, _("None"));
 			} else {
-				_filters->SetLabel (std_to_wx (p));
+				if (p.length() > 25) {
+					p = p.substr (0, 25) + "...";
+				}
+				checked_set (_filters, p);
 			}
 		}
 	} else if (property == VideoContentProperty::VIDEO_FADE_IN) {
-		set<ContentTime> check;
-		for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) {
-			check.insert ((*i)->fade_in ());
+		set<Frame> check;
+		BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
+			check.insert (i->fade_in ());
 		}
-		
+
 		if (check.size() == 1) {
-			_fade_in->set (vc.front()->fade_in (), vc.front()->video_frame_rate ());
+			_fade_in->set (ContentTime::from_frames (vc.front()->fade_in (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
 		} else {
 			_fade_in->clear ();
 		}
 	} else if (property == VideoContentProperty::VIDEO_FADE_OUT) {
-		set<ContentTime> check;
-		for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) {
-			check.insert ((*i)->fade_out ());
+		set<Frame> check;
+		BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
+			check.insert (i->fade_out ());
 		}
-		
+
 		if (check.size() == 1) {
-			_fade_out->set (vc.front()->fade_out (), vc.front()->video_frame_rate ());
+			_fade_out->set (ContentTime::from_frames (vc.front()->fade_out (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
 		} else {
 			_fade_out->clear ();
 		}
+	} else if (property == DCPContentProperty::REFERENCE_VIDEO) {
+		if (vc.size() == 1) {
+			shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (vc.front ());
+			checked_set (_reference, dcp ? dcp->reference_video () : false);
+		} else {
+			checked_set (_reference, false);
+		}
+
+		setup_sensitivity ();
 	}
 }
 
@@ -309,10 +354,10 @@ VideoPanel::setup_description ()
 {
 	VideoContentList vc = _parent->selected_video ();
 	if (vc.empty ()) {
-		_description->SetLabel ("");
+		checked_set (_description, wxT (""));
 		return;
 	} else if (vc.size() > 1) {
-		_description->SetLabel (_("Multiple content selected"));
+		checked_set (_description, _("Multiple content selected"));
 		return;
 	}
 
@@ -323,27 +368,41 @@ VideoPanel::setup_description ()
 		d += "\n ";
 	}
 
-	_description->SetLabel (std_to_wx (d));
+	checked_set (_description, d);
 	_sizer->Layout ();
 }
 
 void
-VideoPanel::edit_colour_conversion_clicked ()
+VideoPanel::colour_conversion_changed ()
 {
 	VideoContentList vc = _parent->selected_video ();
 	if (vc.size() != 1) {
 		return;
 	}
 
-	if (!vc.front()->colour_conversion ()) {
+	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)) {
+		edit_colour_conversion_clicked ();
+	} else {
+		vc.front()->set_colour_conversion (all[s - 1].conversion);
+	}
+}
+
+void
+VideoPanel::edit_colour_conversion_clicked ()
+{
+	VideoContentList vc = _parent->selected_video ();
+	if (vc.size() != 1) {
 		return;
 	}
 
-	ColourConversion conversion = vc.front()->colour_conversion().get ();
 	ContentColourConversionDialog* d = new ContentColourConversionDialog (this);
-	d->set (conversion);
+	d->set (vc.front()->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion));
 	d->ShowModal ();
-
 	vc.front()->set_colour_conversion (d->get ());
 	d->Destroy ();
 }
@@ -352,57 +411,96 @@ void
 VideoPanel::content_selection_changed ()
 {
 	VideoContentList video_sel = _parent->selected_video ();
-	FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
-	
-	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);
 	_scale->set_content (video_sel);
 
-	_filters_button->Enable (single && !ffmpeg_sel.empty ());
-	_colour_conversion_button->Enable (single);
-
 	film_content_changed (VideoContentProperty::VIDEO_CROP);
 	film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 	film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
 	film_content_changed (VideoContentProperty::VIDEO_FADE_IN);
 	film_content_changed (VideoContentProperty::VIDEO_FADE_OUT);
 	film_content_changed (FFmpegContentProperty::FILTERS);
+	film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
+
+	setup_sensitivity ();
+}
+
+void
+VideoPanel::setup_sensitivity ()
+{
+	ContentList sel = _parent->selected ();
+	_reference->Enable (sel.size() == 1 && dynamic_pointer_cast<DCPContent> (sel.front ()));
+
+	if (_reference->GetValue ()) {
+		_frame_type->wrapped()->Enable (false);
+		_left_crop->wrapped()->Enable (false);
+		_right_crop->wrapped()->Enable (false);
+		_top_crop->wrapped()->Enable (false);
+		_bottom_crop->wrapped()->Enable (false);
+		_fade_in->Enable (false);
+		_fade_out->Enable (false);
+		_scale->wrapped()->Enable (false);
+		_description->Enable (false);
+		_filters->Enable (false);
+		_filters_button->Enable (false);
+		_colour_conversion->Enable (false);
+		_edit_colour_conversion_button->Enable (false);
+	} else {
+		VideoContentList video_sel = _parent->selected_video ();
+		FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
+		bool const single = video_sel.size() == 1;
+
+		_frame_type->wrapped()->Enable (true);
+		_left_crop->wrapped()->Enable (true);
+		_right_crop->wrapped()->Enable (true);
+		_top_crop->wrapped()->Enable (true);
+		_bottom_crop->wrapped()->Enable (true);
+		_fade_in->Enable (!video_sel.empty ());
+		_fade_out->Enable (!video_sel.empty ());
+		_scale->wrapped()->Enable (true);
+		_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);
+	}
 }
 
 void
 VideoPanel::fade_in_changed ()
 {
-	VideoContentList vc = _parent->selected_video ();
-	for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) {
-		(*i)->set_fade_in (_fade_in->get (_parent->film()->video_frame_rate ()));
+	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));
 	}
 }
 
 void
 VideoPanel::fade_out_changed ()
 {
-	VideoContentList vc = _parent->selected_video ();
-	for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) {
-		(*i)->set_fade_out (_fade_out->get (_parent->film()->video_frame_rate ()));
+	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));
 	}
 }
 
 void
-VideoPanel::enable_colour_conversion_clicked ()
+VideoPanel::reference_clicked ()
 {
-	VideoContentList vc = _parent->selected_video ();
-	if (vc.size() != 1) {
+	ContentList c = _parent->selected ();
+	if (c.size() != 1) {
 		return;
 	}
 
-	if (_enable_colour_conversion->GetValue()) {
-		vc.front()->set_default_colour_conversion ();
-	} else {
-		vc.front()->unset_colour_conversion ();
+	shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (c.front ());
+	if (!d) {
+		return;
 	}
+
+	d->set_reference_video (_reference->GetValue ());
 }