X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=a5d197c2a15324e81b32e557ed8d45ad0a889931;hb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;hp=d8fdf2d02667c7894477a9e5aaa8691d6758c146;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41;p=dcpomatic.git

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index d8fdf2d02..a5d197c2a 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -28,9 +28,9 @@
 #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;
@@ -309,7 +309,7 @@ VideoPanel::setup_description ()
 	}
 
 	dcp::Size const container_size = _parent->film()->frame_size ();
-	dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size);
+	dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size, 1);
 
 	if (scaled != vcs->video_size_after_crop ()) {
 		d << wxString::Format (
@@ -332,7 +332,7 @@ VideoPanel::setup_description ()
 	d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
 	++lines;
 	FrameRateChange frc (vcs->video_frame_rate(), _parent->film()->video_frame_rate ());
-	d << std_to_wx (frc.description) << "\n";
+	d << std_to_wx (frc.description ()) << "\n";
 	++lines;
 
 	for (int i = lines; i < 6; ++i) {
@@ -363,18 +363,19 @@ VideoPanel::edit_colour_conversion_clicked ()
 void
 VideoPanel::content_selection_changed ()
 {
-	VideoContentList sel = _parent->selected_video ();
-	bool const single = sel.size() == 1;
-
-	_left_crop->set_content (sel);
-	_right_crop->set_content (sel);
-	_top_crop->set_content (sel);
-	_bottom_crop->set_content (sel);
-	_frame_type->set_content (sel);
-	_scale->set_content (sel);
-
-	/* Things that are only allowed with single selections */
-	_filters_button->Enable (single);
+	VideoContentList video_sel = _parent->selected_video ();
+	FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
+	
+	bool const single = video_sel.size() == 1;
+
+	_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);