X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=399e71aac26edba4d752847d0faa4240bb2ead69;hp=aa0f7d019a6af5dd232ed15e2c19ad78dfbb5afa;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=3a9bea8c3727af6ebbce860b8223371cd7f87b3f

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index aa0f7d019..399e71aac 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -196,6 +196,9 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	_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));
@@ -240,12 +243,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));
 			}
 		}
 	}
@@ -295,8 +297,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,
@@ -305,8 +307,8 @@ VideoPanel::setup_description ()
 		++lines;
 	}
 
-	libdcp::Size const container_size = _editor->film()->frame_size ();
-	libdcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size);
+	dcp::Size const container_size = _editor->film()->frame_size ();
+	dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size);
 
 	if (scaled != vcs->video_size_after_crop ()) {
 		d << wxString::Format (
@@ -328,7 +330,7 @@ VideoPanel::setup_description ()
 
 	d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
 	++lines;
-	FrameRateConversion frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
+	FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
 	d << std_to_wx (frc.description) << "\n";
 	++lines;