Merge 1.0

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 5d841b0cc45d6c5b5c3481076e85c657febc16c4..a777b3e88da8f317f9b0e8f3221850a3c6407c35 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -199,6 +199,7 @@ VideoPanel::VideoPanel (FilmEditor* e)
 
        _frame_type->wrapped()->Append (_("2D"));
        _frame_type->wrapped()->Append (_("3D left/right"));
+       _frame_type->wrapped()->Append (_("3D top/bottom"));
 
        _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));
@@ -210,6 +211,7 @@ VideoPanel::film_changed (Film::Property property)
        switch (property) {
        case Film::CONTAINER:
        case Film::VIDEO_FRAME_RATE:
+       case Film::RESOLUTION:
                setup_description ();
                break;
        default:
@@ -271,7 +273,7 @@ VideoPanel::edit_filters_clicked ()
 void
 VideoPanel::setup_description ()
 {
-       FFmpegContentList vc = _editor->selected_ffmpeg_content ();
+       VideoContentList vc = _editor->selected_video_content ();
        if (vc.empty ()) {
                _description->SetLabel ("");
                return;
@@ -280,7 +282,7 @@ VideoPanel::setup_description ()
                return;
        }
 
-       shared_ptr<FFmpegContent> vcs = vc.front ();
+       shared_ptr<VideoContent> vcs = vc.front ();
 
        wxString d;
 
@@ -332,7 +334,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 << frc.description << "\n";
        ++lines;