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"))
{
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 ContentWidget<VideoContent, wxSpinCtrl> (
+ _left_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
VideoContentProperty::VIDEO_CROP,
++r;
add_label_to_grid_bag_sizer (grid, this, _("Right crop"), true, wxGBPosition (r, 0));
- _right_crop = new ContentWidget<VideoContent, wxSpinCtrl> (
+ _right_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
VideoContentProperty::VIDEO_CROP,
++r;
add_label_to_grid_bag_sizer (grid, this, _("Top crop"), true, wxGBPosition (r, 0));
- _top_crop = new ContentWidget<VideoContent, wxSpinCtrl> (
+ _top_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
VideoContentProperty::VIDEO_CROP,
++r;
add_label_to_grid_bag_sizer (grid, this, _("Bottom crop"), true, wxGBPosition (r, 0));
- _bottom_crop = new ContentWidget<VideoContent, wxSpinCtrl> (
+ _bottom_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
VideoContentProperty::VIDEO_CROP,
++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;
{
_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"));
+ _ratio->wrapped()->Append (_("No stretch"));
- _frame_type->Append (_("2D"));
- _frame_type->Append (_("3D left/right"));
+ _frame_type->wrapped()->Append (_("2D"));
+ _frame_type->wrapped()->Append (_("3D left/right"));
- _frame_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&VideoPanel::frame_type_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));
}
}
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) {
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 ();
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;
_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 ()
{
_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);
projects / dcpomatic.git / blobdiff