Merge master.

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index eb45d4bc81a0b82ec38c35e342866c1da0cb7432..cd831baed7cbc5b97324d97a1a603773d0ee0614 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -24,12 +24,13 @@
 #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"
-#include "film_editor.h"
 #include "content_colour_conversion_dialog.h"
 #include "content_widget.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::string;
@@ -63,8 +64,8 @@ scale_to_index (VideoContentScale scale)
        assert (false);
 }
 
-VideoPanel::VideoPanel (FilmEditor* e)
-       : FilmEditorPanel (e, _("Video"))
+VideoPanel::VideoPanel (ContentPanel* p)
+       : ContentSubPanel (p, _("Video"))
 {
        wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        _sizer->Add (grid, 0, wxALL, 8);
@@ -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));
@@ -218,7 +222,7 @@ VideoPanel::film_changed (Film::Property property)
 void
 VideoPanel::film_content_changed (int property)
 {
-       VideoContentList vc = _editor->selected_video_content ();
+       VideoContentList vc = _parent->selected_video ();
        shared_ptr<VideoContent> vcs;
        shared_ptr<FFmpegContent> fcs;
        if (!vc.empty ()) {
@@ -240,12 +244,11 @@ VideoPanel::film_content_changed (int property)
                _colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
        } else if (property == FFmpegContentProperty::FILTERS) {
                if (fcs) {
-                       pair<string, string> p = Filter::ffmpeg_strings (fcs->filters ());
-                       if (p.first.empty () && p.second.empty ()) {
+                       string const p = Filter::ffmpeg_string (fcs->filters ());
+                       if (p.empty ()) {
                                _filters->SetLabel (_("None"));
                        } else {
-                               string const b = p.first + " " + p.second;
-                               _filters->SetLabel (std_to_wx (b));
+                               _filters->SetLabel (std_to_wx (p));
                        }
                }
        }
@@ -255,7 +258,7 @@ VideoPanel::film_content_changed (int property)
 void
 VideoPanel::edit_filters_clicked ()
 {
-       FFmpegContentList c = _editor->selected_ffmpeg_content ();
+       FFmpegContentList c = _parent->selected_ffmpeg ();
        if (c.size() != 1) {
                return;
        }
@@ -269,7 +272,7 @@ VideoPanel::edit_filters_clicked ()
 void
 VideoPanel::setup_description ()
 {
-       VideoContentList vc = _editor->selected_video_content ();
+       VideoContentList vc = _parent->selected_video ();
        if (vc.empty ()) {
                _description->SetLabel ("");
                return;
@@ -305,8 +308,8 @@ VideoPanel::setup_description ()
                ++lines;
        }
 
-       dcp::Size const container_size = fit_ratio_within (_editor->film()->container()->ratio (), _editor->film()->full_frame ());
-       dcp::Size const scaled = vcs->scale().size (vcs, container_size);
+       dcp::Size const container_size = _parent->film()->frame_size ();
+       dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size, 1);
 
        if (scaled != vcs->video_size_after_crop ()) {
                d << wxString::Format (
@@ -328,8 +331,8 @@ VideoPanel::setup_description ()
 
        d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
        ++lines;
-       FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
-       d << std_to_wx (frc.description) << "\n";
+       FrameRateChange frc (vcs->video_frame_rate(), _parent->film()->video_frame_rate ());
+       d << std_to_wx (frc.description ()) << "\n";
        ++lines;
 
        for (int i = lines; i < 6; ++i) {
@@ -343,7 +346,7 @@ VideoPanel::setup_description ()
 void
 VideoPanel::edit_colour_conversion_clicked ()
 {
-       VideoContentList vc = _editor->selected_video_content ();
+       VideoContentList vc = _parent->selected_video ();
        if (vc.size() != 1) {
                return;
        }
@@ -360,7 +363,7 @@ VideoPanel::edit_colour_conversion_clicked ()
 void
 VideoPanel::content_selection_changed ()
 {
-       VideoContentList sel = _editor->selected_video_content ();
+       VideoContentList sel = _parent->selected_video ();
        bool const single = sel.size() == 1;
 
        _left_crop->set_content (sel);