Stop CPL <Creator> tag being configurable and use DCP-o-matic version number instead.

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 38604248cb759440160eea127a5ba762420d3df7..b33a97591c6617e45fe3a2da2a04bd1fca0fbe24 100644 (file)
--- 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));
@@ -327,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) {
@@ -359,18 +363,19 @@ VideoPanel::edit_colour_conversion_clicked ()
 void
 VideoPanel::content_selection_changed ()
 {
-       VideoContentList sel = _editor->selected_video_content ();
-       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 = _editor->selected_video_content ();
+       FFmpegContentList ffmpeg_sel = _editor->selected_ffmpeg_content ();
+       
+       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);