X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=fcb1b9f806069babf0f2032ae01a8ba1adf035b6;hb=fdf4bfbca898ba5401a6853f481968d15b6ebded;hp=aa0f7d019a6af5dd232ed15e2c19ad78dfbb5afa;hpb=b5d2f083b2f8b260ac238bd06092773770605850;p=dcpomatic.git

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index aa0f7d019..fcb1b9f80 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -24,6 +24,7 @@
 #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"
@@ -196,6 +197,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 +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));
 			}
 		}
 	}
@@ -328,8 +331,8 @@ 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 ());
-	d << std_to_wx (frc.description) << "\n";
+	FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
+	d << std_to_wx (frc.description ()) << "\n";
 	++lines;
 
 	for (int i = lines; i < 6; ++i) {