X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=6a6e694cbe0423a7431cd0636d6f1805a55420d3;hb=1629bd7df2150156109afbc7a16677cb29e82adf;hp=90b4adfe396a716b157538903c2542217bc6cee4;hpb=a2107a86ee1e5170ab77a04e524bbb5dd94b20c5;p=dcpomatic.git

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 90b4adfe3..6a6e694cb 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -299,8 +299,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,
@@ -310,11 +310,11 @@ VideoPanel::setup_description ()
 	}
 
 	Ratio const * ratio = vcs->ratio ();
-	libdcp::Size container_size = fit_ratio_within (_editor->film()->container()->ratio (), _editor->film()->full_frame ());
+	dcp::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 ();
 
 	/* We have a specified ratio to scale to */
-	libdcp::Size const scaled = fit_ratio_within (ratio_value, container_size);
+	dcp::Size const scaled = fit_ratio_within (ratio_value, container_size);
 	
 	d << wxString::Format (
 		_("Scaled to %dx%d (%.2f:1)\n"),
@@ -334,8 +334,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 << 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) {