}
_frame_type->wrapped()->Append (_("2D"));
+ _frame_type->wrapped()->Append (_("3D"));
_frame_type->wrapped()->Append (_("3D left/right"));
_frame_type->wrapped()->Append (_("3D top/bottom"));
_frame_type->wrapped()->Append (_("3D alternate"));
_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
- _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::reference_clicked, this));
- _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_filters_clicked, this));
- _colour_conversion->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&VideoPanel::colour_conversion_changed, this));
- _edit_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
+ _reference->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
+ _filters_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_filters_clicked, this));
+ _colour_conversion->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::colour_conversion_changed, this));
+ _edit_colour_conversion_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
}
void
VideoPanel::film_changed (Film::Property property)
{
switch (property) {
- case Film::CONTAINER:
case Film::VIDEO_FRAME_RATE:
+ case Film::CONTAINER:
+ setup_description ();
+ setup_sensitivity ();
+ break;
case Film::RESOLUTION:
setup_description ();
break;
case Film::REEL_TYPE:
case Film::INTEROP:
setup_sensitivity ();
+ break;
default:
break;
}
}
ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ());
- d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion));
- d->ShowModal ();
- vc.front()->video->set_colour_conversion (d->get ());
+ d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion));
+ if (d->ShowModal() == wxID_OK) {
+ vc.front()->video->set_colour_conversion (d->get ());
+ } else {
+ /* Reset the colour conversion choice */
+ film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
+ }
d->Destroy ();
}