Merge master.

[dcpomatic.git] / src / wx / video_panel.cc

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index ac4c29222b231e9912ca1e7306bbd91f253c8ac2..399e71aac26edba4d752847d0faa4240bb2ead69 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -297,8 +297,8 @@ VideoPanel::setup_description ()
        }
 
        Crop const crop = vcs->crop ();
        }
 
        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,
                d << wxString::Format (
                        _("Cropped to %dx%d (%.2f:1)\n"),
                        cropped.width, cropped.height,


@@ -307,8 +307,8 @@ VideoPanel::setup_description ()
                ++lines;
        }
 
                ++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 (
 
        if (scaled != vcs->video_size_after_crop ()) {
                d << wxString::Format (


@@ -330,7 +330,7 @@ VideoPanel::setup_description ()
 
        d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
        ++lines;
 
        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;
 
        d << std_to_wx (frc.description) << "\n";
        ++lines;