X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=f00edd8fff0f69c3168911694a22b906581fd567;hb=f021a24c9db4df2afb096392f9da18dba80b25d3;hp=b439d13c4e47412f1950283ae9beb584942ef85f;hpb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;p=dcpomatic.git

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index b439d13c4..f00edd8ff 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -18,18 +18,19 @@
 */
 
 #include <wx/spinctrl.h>
-#include "lib/ratio.h"
 #include "lib/filter.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
 #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 "film_editor.h"
 #include "content_colour_conversion_dialog.h"
 #include "content_widget.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::string;
@@ -41,33 +42,30 @@ using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
 
-static Ratio const *
-index_to_ratio (int n)
+static VideoContentScale
+index_to_scale (int n)
 {
+	vector<VideoContentScale> scales = VideoContentScale::all ();
 	assert (n >= 0);
-	
-	vector<Ratio const *> ratios = Ratio::all ();
-	if (n >= int (ratios.size ())) {
-		return 0;
-	}
-
-	return ratios[n];
+	assert (n < int (scales.size ()));
+	return scales[n];
 }
 
 static int
-ratio_to_index (Ratio const * r)
+scale_to_index (VideoContentScale scale)
 {
-	vector<Ratio const *> ratios = Ratio::all ();
-	size_t i = 0;
-	while (i < ratios.size() && ratios[i] != r) {
-		++i;
+	vector<VideoContentScale> scales = VideoContentScale::all ();
+	for (size_t i = 0; i < scales.size(); ++i) {
+		if (scales[i] == scale) {
+			return i;
+		}
 	}
 
-	return i;
+	assert (false);
 }
 
-VideoPanel::VideoPanel (FilmEditor* e)
-	: FilmEditorPanel (e, _("Video"))
+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);
@@ -132,16 +130,16 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	++r;
 
 	add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
-	_ratio = new ContentChoice<VideoContent, Ratio const *> (
+	_scale = new ContentChoice<VideoContent, VideoContentScale> (
 		this,
 		new wxChoice (this, wxID_ANY),
-		VideoContentProperty::VIDEO_RATIO,
-		boost::mem_fn (&VideoContent::ratio),
-		boost::mem_fn (&VideoContent::set_ratio),
-		&index_to_ratio,
-		&ratio_to_index
+		VideoContentProperty::VIDEO_SCALE,
+		boost::mem_fn (&VideoContent::scale),
+		boost::mem_fn (&VideoContent::set_scale),
+		&index_to_scale,
+		&scale_to_index
 		);
-	_ratio->add (grid, wxGBPosition (r, 1));
+	_scale->add (grid, wxGBPosition (r, 1));
 	++r;
 
 	{
@@ -190,16 +188,18 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	_right_crop->wrapped()->SetRange (0, 1024);
 	_bottom_crop->wrapped()->SetRange (0, 1024);
 
-	vector<Ratio const *> ratios = Ratio::all ();
-	_ratio->wrapped()->Clear ();
-	for (vector<Ratio const *>::iterator i = ratios.begin(); i != ratios.end(); ++i) {
-		_ratio->wrapped()->Append (std_to_wx ((*i)->nickname ()));
+	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 ()));
 	}
-	_ratio->wrapped()->Append (_("No stretch"));
 
 	_frame_type->wrapped()->Append (_("2D"));
 	_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"));
 
 	_filters_button->Bind           (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
 	_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
@@ -222,7 +222,7 @@ VideoPanel::film_changed (Film::Property property)
 void
 VideoPanel::film_content_changed (int property)
 {
-	VideoContentList vc = _editor->selected_video_content ();
+	VideoContentList vc = _parent->selected_video ();
 	shared_ptr<VideoContent> vcs;
 	shared_ptr<FFmpegContent> fcs;
 	if (!vc.empty ()) {
@@ -234,7 +234,7 @@ VideoPanel::film_content_changed (int property)
 		setup_description ();
 	} else if (property == VideoContentProperty::VIDEO_CROP) {
 		setup_description ();
-	} else if (property == VideoContentProperty::VIDEO_RATIO) {
+	} else if (property == VideoContentProperty::VIDEO_SCALE) {
 		setup_description ();
 	} else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
 		setup_description ();
@@ -244,12 +244,11 @@ VideoPanel::film_content_changed (int property)
 		_colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
 	} else if (property == FFmpegContentProperty::FILTERS) {
 		if (fcs) {
-			pair<string, string> p = Filter::ffmpeg_strings (fcs->filters ());
-			if (p.first.empty () && p.second.empty ()) {
+			string const p = Filter::ffmpeg_string (fcs->filters ());
+			if (p.empty ()) {
 				_filters->SetLabel (_("None"));
 			} else {
-				string const b = p.first + " " + p.second;
-				_filters->SetLabel (std_to_wx (b));
+				_filters->SetLabel (std_to_wx (p));
 			}
 		}
 	}
@@ -259,7 +258,7 @@ VideoPanel::film_content_changed (int property)
 void
 VideoPanel::edit_filters_clicked ()
 {
-	FFmpegContentList c = _editor->selected_ffmpeg_content ();
+	FFmpegContentList c = _parent->selected_ffmpeg ();
 	if (c.size() != 1) {
 		return;
 	}
@@ -273,7 +272,7 @@ VideoPanel::edit_filters_clicked ()
 void
 VideoPanel::setup_description ()
 {
-	VideoContentList vc = _editor->selected_video_content ();
+	VideoContentList vc = _parent->selected_video ();
 	if (vc.empty ()) {
 		_description->SetLabel ("");
 		return;
@@ -299,8 +298,8 @@ VideoPanel::setup_description ()
 	}
 
 	Crop const crop = vcs->crop ();
-	if ((crop.left || crop.right || crop.top || crop.bottom) && vcs->video_size() != libdcp::Size (0, 0)) {
-		libdcp::Size cropped = vcs->video_size_after_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,
@@ -309,19 +308,17 @@ VideoPanel::setup_description ()
 		++lines;
 	}
 
-	Ratio const * ratio = vcs->ratio ();
-	libdcp::Size container_size = fit_ratio_within (_editor->film()->container()->ratio (), _editor->film()->full_frame ());
-	float const ratio_value = ratio ? ratio->ratio() : vcs->video_size_after_crop().ratio ();
+	dcp::Size const container_size = _parent->film()->frame_size ();
+	dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size, 1);
 
-	/* We have a specified ratio to scale to */
-	libdcp::Size const scaled = fit_ratio_within (ratio_value, container_size);
-	
-	d << wxString::Format (
-		_("Scaled to %dx%d (%.2f:1)\n"),
-		scaled.width, scaled.height,
-		scaled.ratio ()
-		);
-	++lines;
+	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 (
@@ -334,7 +331,7 @@ VideoPanel::setup_description ()
 
 	d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
 	++lines;
-	FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
+	FrameRateChange frc (vcs->video_frame_rate(), _parent->film()->video_frame_rate ());
 	d << std_to_wx (frc.description) << "\n";
 	++lines;
 
@@ -349,7 +346,7 @@ VideoPanel::setup_description ()
 void
 VideoPanel::edit_colour_conversion_clicked ()
 {
-	VideoContentList vc = _editor->selected_video_content ();
+	VideoContentList vc = _parent->selected_video ();
 	if (vc.size() != 1) {
 		return;
 	}
@@ -366,7 +363,7 @@ VideoPanel::edit_colour_conversion_clicked ()
 void
 VideoPanel::content_selection_changed ()
 {
-	VideoContentList sel = _editor->selected_video_content ();
+	VideoContentList sel = _parent->selected_video ();
 	bool const single = sel.size() == 1;
 
 	_left_crop->set_content (sel);
@@ -374,7 +371,7 @@ VideoPanel::content_selection_changed ()
 	_top_crop->set_content (sel);
 	_bottom_crop->set_content (sel);
 	_frame_type->set_content (sel);
-	_ratio->set_content (sel);
+	_scale->set_content (sel);
 
 	/* Things that are only allowed with single selections */
 	_filters_button->Enable (single);