X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=9c044e1889f51109517276899ef7350135a9aa26;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=2ae4e0fb799bb6f0f3d3ee9861c9961caa0d78b2;hpb=76037799956725486be80524b1f72d7e3dc827ec;p=dcpomatic.git

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 2ae4e0fb7..9c044e188 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,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"
@@ -48,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)
@@ -74,8 +78,8 @@ scale_to_index (VideoContentScale scale)
 VideoPanel::VideoPanel (ContentPanel* p)
 	: ContentSubPanel (p, _("Video"))
 {
-	_reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF"));
-	_reference_note = new wxStaticText (this, wxID_ANY, wxT(""));
+	_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);
@@ -157,8 +161,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	size.SetHeight (-1);
 
 	_filters_label = create_label (this, _("Filters"), true);
-	_filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
-	_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
+	_filters = new StaticText (this, _("None"), wxDefaultPosition, size);
+	_filters_button = new Button (this, _("Edit..."));
 
 	_colour_conversion_label = create_label (this, _("Colour conversion"), true);
 	_colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
@@ -169,15 +173,15 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
 	/// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
 	_colour_conversion->Append (S_("Colour|Custom"));
-	_edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
+	_edit_colour_conversion_button = new Button (this, _("Edit..."));
 
-	_description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
+	_description = new StaticText (this, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
 	_description->SetFont(font);
 
-	_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 ()) {
@@ -241,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);
@@ -254,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;
@@ -361,8 +361,8 @@ VideoPanel::film_content_changed (int property)
 
 		if (check.size() == 1) {
 			_fade_in->set (
-				ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()),
-				vc.front()->active_video_frame_rate ()
+				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 ();
@@ -375,8 +375,8 @@ VideoPanel::film_content_changed (int property)
 
 		if (check.size() == 1) {
 			_fade_out->set (
-				ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()),
-				vc.front()->active_video_frame_rate ()
+				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 ();
@@ -420,7 +420,7 @@ VideoPanel::setup_description ()
 		return;
 	}
 
-	string d = vc.front()->video->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) {
@@ -504,7 +504,7 @@ VideoPanel::setup_sensitivity ()
 	}
 
 	string why_not;
-	bool const can_reference = dcp && dcp->can_reference_video (why_not);
+	bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not);
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
 	if (_reference->GetValue ()) {