Merge 1.0
[dcpomatic.git] / src / wx / video_panel.cc
index 3b4dc7e46f60c7d5660ca5ca56e087ea5352b438..a777b3e88da8f317f9b0e8f3221850a3c6407c35 100644 (file)
@@ -29,7 +29,7 @@
 #include "wx_util.h"
 #include "film_editor.h"
 #include "content_colour_conversion_dialog.h"
-#include "multiple_widget.h"
+#include "content_widget.h"
 
 using std::vector;
 using std::string;
@@ -41,6 +41,31 @@ using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
 
+static Ratio const *
+index_to_ratio (int n)
+{
+       assert (n >= 0);
+       
+       vector<Ratio const *> ratios = Ratio::all ();
+       if (n >= int (ratios.size ())) {
+               return 0;
+       }
+
+       return ratios[n];
+}
+
+static int
+ratio_to_index (Ratio const * r)
+{
+       vector<Ratio const *> ratios = Ratio::all ();
+       size_t i = 0;
+       while (i < ratios.size() && ratios[i] != r) {
+               ++i;
+       }
+
+       return i;
+}
+
 VideoPanel::VideoPanel (FilmEditor* e)
        : FilmEditorPanel (e, _("Video"))
 {
@@ -50,33 +75,73 @@ VideoPanel::VideoPanel (FilmEditor* e)
        int r = 0;
 
        add_label_to_grid_bag_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0));
-       _frame_type = new wxChoice (this, wxID_ANY);
-       grid->Add (_frame_type, wxGBPosition (r, 1));
+       _frame_type = new ContentChoice<VideoContent, VideoFrameType> (
+               this,
+               new wxChoice (this, wxID_ANY),
+               VideoContentProperty::VIDEO_FRAME_TYPE,
+               boost::mem_fn (&VideoContent::video_frame_type),
+               boost::mem_fn (&VideoContent::set_video_frame_type),
+               &caster<int, VideoFrameType>,
+               &caster<VideoFrameType, int>
+               );
+       _frame_type->add (grid, wxGBPosition (r, 1));
        ++r;
        
        add_label_to_grid_bag_sizer (grid, this, _("Left crop"), true, wxGBPosition (r, 0));
-       _left_crop = new MultipleWidget<wxSpinCtrl> (this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)));
+       _left_crop = new ContentSpinCtrl<VideoContent> (
+               this,
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               VideoContentProperty::VIDEO_CROP,
+               boost::mem_fn (&VideoContent::left_crop),
+               boost::mem_fn (&VideoContent::set_left_crop)
+               );
        _left_crop->add (grid, wxGBPosition (r, 1));
        ++r;
 
        add_label_to_grid_bag_sizer (grid, this, _("Right crop"), true, wxGBPosition (r, 0));
-       _right_crop = new MultipleWidget<wxSpinCtrl> (this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)));
+       _right_crop = new ContentSpinCtrl<VideoContent> (
+               this,
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               VideoContentProperty::VIDEO_CROP,
+               boost::mem_fn (&VideoContent::right_crop),
+               boost::mem_fn (&VideoContent::set_right_crop)
+               );
        _right_crop->add (grid, wxGBPosition (r, 1));
        ++r;
        
        add_label_to_grid_bag_sizer (grid, this, _("Top crop"), true, wxGBPosition (r, 0));
-       _top_crop = new MultipleWidget<wxSpinCtrl> (this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)));
+       _top_crop = new ContentSpinCtrl<VideoContent> (
+               this,
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               VideoContentProperty::VIDEO_CROP,
+               boost::mem_fn (&VideoContent::top_crop),
+               boost::mem_fn (&VideoContent::set_top_crop)
+               );
        _top_crop->add (grid, wxGBPosition (r,1 ));
        ++r;
        
        add_label_to_grid_bag_sizer (grid, this, _("Bottom crop"), true, wxGBPosition (r, 0));
-       _bottom_crop = new MultipleWidget<wxSpinCtrl> (this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)));
+       _bottom_crop = new ContentSpinCtrl<VideoContent> (
+               this,
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               VideoContentProperty::VIDEO_CROP,
+               boost::mem_fn (&VideoContent::bottom_crop),
+               boost::mem_fn (&VideoContent::set_bottom_crop)
+               );
        _bottom_crop->add (grid, wxGBPosition (r, 1));
        ++r;
 
        add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
-       _ratio = new wxChoice (this, wxID_ANY);
-       grid->Add (_ratio, wxGBPosition (r, 1));
+       _ratio = new ContentChoice<VideoContent, Ratio const *> (
+               this,
+               new wxChoice (this, wxID_ANY),
+               VideoContentProperty::VIDEO_RATIO,
+               boost::mem_fn (&VideoContent::ratio),
+               boost::mem_fn (&VideoContent::set_ratio),
+               &index_to_ratio,
+               &ratio_to_index
+               );
+       _ratio->add (grid, wxGBPosition (r, 1));
        ++r;
 
        {
@@ -126,65 +191,18 @@ VideoPanel::VideoPanel (FilmEditor* e)
        _bottom_crop->wrapped()->SetRange (0, 1024);
 
        vector<Ratio const *> ratios = Ratio::all ();
-       _ratio->Clear ();
+       _ratio->wrapped()->Clear ();
        for (vector<Ratio const *>::iterator i = ratios.begin(); i != ratios.end(); ++i) {
-               _ratio->Append (std_to_wx ((*i)->nickname ()));
+               _ratio->wrapped()->Append (std_to_wx ((*i)->nickname ()));
        }
-       _ratio->Append (_("No stretch"));
-
-       _frame_type->Append (_("2D"));
-       _frame_type->Append (_("3D left/right"));
-
-       _frame_type->Bind               (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::frame_type_changed, this));
-       _left_crop->SetAllSame.connect  (boost::bind (&VideoPanel::set_left_crop_same, this));
-       _left_crop->wrapped()->Bind     (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::left_crop_changed, this));
-       _right_crop->wrapped()->Bind    (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::right_crop_changed, this));
-       _top_crop->wrapped()->Bind      (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::top_crop_changed, this));
-       _bottom_crop->wrapped()->Bind   (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::bottom_crop_changed, this));
-       _ratio->Bind                    (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::ratio_changed, this));
-       _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));
-}
+       _ratio->wrapped()->Append (_("No stretch"));
 
+       _frame_type->wrapped()->Append (_("2D"));
+       _frame_type->wrapped()->Append (_("3D left/right"));
+       _frame_type->wrapped()->Append (_("3D top/bottom"));
 
-/** Called when the left crop widget has been changed */
-void
-VideoPanel::left_crop_changed ()
-{
-       VideoContentList c = _editor->selected_video_content ();
-       for (VideoContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_left_crop (_left_crop->wrapped()->GetValue ());
-       }
-}
-
-/** Called when the right crop widget has been changed */
-void
-VideoPanel::right_crop_changed ()
-{
-       VideoContentList c = _editor->selected_video_content ();
-       for (VideoContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_right_crop (_right_crop->wrapped()->GetValue ());
-       }
-}
-
-/** Called when the top crop widget has been changed */
-void
-VideoPanel::top_crop_changed ()
-{
-       VideoContentList c = _editor->selected_video_content ();
-       for (VideoContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_top_crop (_top_crop->wrapped()->GetValue ());
-       }
-}
-
-/** Called when the bottom crop value has been changed */
-void
-VideoPanel::bottom_crop_changed ()
-{
-       VideoContentList c = _editor->selected_video_content ();
-       for (VideoContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_bottom_crop (_bottom_crop->wrapped()->GetValue ());
-       }
+       _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));
 }
 
 void
@@ -193,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:
@@ -212,32 +231,10 @@ VideoPanel::film_content_changed (int property)
        }
        
        if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
-               checked_set (_frame_type, vcs ? vcs->video_frame_type () : VIDEO_FRAME_TYPE_2D);
                setup_description ();
        } else if (property == VideoContentProperty::VIDEO_CROP) {
-               set_multiple<VideoContent> (vc, _left_crop, &VideoContent::left_crop);
-               set_multiple<VideoContent> (vc, _right_crop, &VideoContent::right_crop);
-               set_multiple<VideoContent> (vc, _top_crop, &VideoContent::top_crop);
-               set_multiple<VideoContent> (vc, _bottom_crop, &VideoContent::bottom_crop);
                setup_description ();
        } else if (property == VideoContentProperty::VIDEO_RATIO) {
-               if (vcs) {
-                       int n = 0;
-                       vector<Ratio const *> ratios = Ratio::all ();
-                       vector<Ratio const *>::iterator i = ratios.begin ();
-                       while (i != ratios.end() && *i != vcs->ratio()) {
-                               ++i;
-                               ++n;
-                       }
-
-                       if (i == ratios.end()) {
-                               checked_set (_ratio, ratios.size ());
-                       } else {
-                               checked_set (_ratio, n);
-                       }
-               } else {
-                       checked_set (_ratio, -1);
-               }
                setup_description ();
        } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
                setup_description ();
@@ -276,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;
@@ -285,7 +282,7 @@ VideoPanel::setup_description ()
                return;
        }
 
-       shared_ptr<FFmpegContent> vcs = vc.front ();
+       shared_ptr<VideoContent> vcs = vc.front ();
 
        wxString d;
 
@@ -337,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;
 
@@ -349,39 +346,6 @@ VideoPanel::setup_description ()
        _sizer->Layout ();
 }
 
-
-void
-VideoPanel::ratio_changed ()
-{
-       if (!_editor->film ()) {
-               return;
-       }
-
-       VideoContentList vc = _editor->selected_video_content ();
-       if (vc.size() != 1) {
-               return;
-       }
-       
-       int const n = _ratio->GetSelection ();
-       if (n >= 0) {
-               vector<Ratio const *> ratios = Ratio::all ();
-               if (n < int (ratios.size ())) {
-                       vc.front()->set_ratio (ratios[n]);
-               } else {
-                       vc.front()->set_ratio (0);
-               }
-       }
-}
-
-void
-VideoPanel::frame_type_changed ()
-{
-       VideoContentList vc = _editor->selected_video_content ();
-       if (vc.size() == 1) {
-               vc.front()->set_video_frame_type (static_cast<VideoFrameType> (_frame_type->GetSelection ()));
-       }
-}
-
 void
 VideoPanel::edit_colour_conversion_clicked ()
 {
@@ -404,34 +368,20 @@ VideoPanel::content_selection_changed ()
 {
        VideoContentList sel = _editor->selected_video_content ();
        bool const single = sel.size() == 1;
-       bool const multiple = sel.size() > 1;
 
-       /* Things that are allowed with multiple selections */
-       _left_crop->wrapped()->Enable   (single || multiple);
-       _right_crop->wrapped()->Enable  (single || multiple);
-       _top_crop->wrapped()->Enable    (single || multiple);
-       _bottom_crop->wrapped()->Enable (single || multiple);
+       _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);
+       _ratio->set_content (sel);
 
        /* Things that are only allowed with single selections */
-       _frame_type->Enable (single);
-       _ratio->Enable (single);
        _filters_button->Enable (single);
        _colour_conversion_button->Enable (single);
 
-       film_content_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
        film_content_changed (VideoContentProperty::VIDEO_CROP);
-       film_content_changed (VideoContentProperty::VIDEO_RATIO);
        film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
        film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
        film_content_changed (FFmpegContentProperty::FILTERS);
 }
-
-void
-VideoPanel::set_left_crop_same ()
-{
-       VideoContentList sel = _editor->selected_video_content ();
-       for (VideoContentList::iterator i = sel.begin(); i != sel.end(); ++i) {
-               (*i)->set_left_crop (sel.front()->left_crop ());
-       }
-}
-