X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fvideo_panel.cc;h=a1457ac6dd5041db5e09cae4e1a69bb6feeeb61e;hb=9b4f7ab687bc494f451bada299b5d165bab7e5a5;hp=b5bd27b243f7d0e9d2af338dd3072c06509a0e64;hpb=c5dab5fdc0edde080e408a6d24fa059e27106ef5;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index b5bd27b24..a1457ac6d 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -86,9 +87,10 @@ VideoPanel::VideoPanel (ContentPanel* p) _frame_type = new ContentChoice ( 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), + VideoContentProperty::FRAME_TYPE, + &Content::video, + boost::mem_fn (&VideoContent::frame_type), + boost::mem_fn (&VideoContent::set_frame_type), &caster, &caster ); @@ -104,7 +106,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::left_crop), boost::mem_fn (&VideoContent::set_left_crop) ); @@ -114,7 +117,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::right_crop), boost::mem_fn (&VideoContent::set_right_crop) ); @@ -126,7 +130,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::top_crop), boost::mem_fn (&VideoContent::set_top_crop) ); @@ -136,7 +141,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::bottom_crop), boost::mem_fn (&VideoContent::set_bottom_crop) ); @@ -159,7 +165,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _scale = new ContentChoice ( this, new wxChoice (this, wxID_ANY), - VideoContentProperty::VIDEO_SCALE, + VideoContentProperty::SCALE, + &Content::video, boost::mem_fn (&VideoContent::scale), boost::mem_fn (&VideoContent::set_scale), &index_to_scale, @@ -225,6 +232,7 @@ VideoPanel::VideoPanel (ContentPanel* p) } _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")); @@ -250,7 +258,9 @@ VideoPanel::film_changed (Film::Property property) setup_description (); break; case Film::REEL_TYPE: + case Film::INTEROP: setup_sensitivity (); + break; default: break; } @@ -267,13 +277,10 @@ VideoPanel::film_content_changed (int property) fcs = dynamic_pointer_cast (vcs); } - if (property == VideoContentProperty::VIDEO_FRAME_TYPE) { - setup_description (); - } else if (property == VideoContentProperty::VIDEO_CROP) { - setup_description (); - } else if (property == VideoContentProperty::VIDEO_SCALE) { - setup_description (); - } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) { + if (property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE || + property == VideoContentProperty::CROP || + property == VideoContentProperty::SCALE) { setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { if (vcs && vcs->video->colour_conversion ()) { @@ -302,7 +309,7 @@ VideoPanel::film_content_changed (int property) checked_set (_filters, p); } } - } else if (property == VideoContentProperty::VIDEO_FADE_IN) { + } else if (property == VideoContentProperty::FADE_IN) { set check; BOOST_FOREACH (shared_ptr i, vc) { check.insert (i->video->fade_in ()); @@ -310,13 +317,13 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_in->set ( - ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->video->video_frame_rate ()), - vc.front()->video->video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()), + vc.front()->active_video_frame_rate () ); } else { _fade_in->clear (); } - } else if (property == VideoContentProperty::VIDEO_FADE_OUT) { + } else if (property == VideoContentProperty::FADE_OUT) { set check; BOOST_FOREACH (shared_ptr i, vc) { check.insert (i->video->fade_out ()); @@ -324,8 +331,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_out->set ( - ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->video->video_frame_rate ()), - vc.front()->video->video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()), + vc.front()->active_video_frame_rate () ); } else { _fade_out->clear (); @@ -409,9 +416,13 @@ VideoPanel::edit_colour_conversion_clicked () } 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 (); } @@ -427,11 +438,11 @@ VideoPanel::content_selection_changed () _bottom_crop->set_content (video_sel); _scale->set_content (video_sel); - film_content_changed (VideoContentProperty::VIDEO_CROP); - film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE); + film_content_changed (ContentProperty::VIDEO_FRAME_RATE); + film_content_changed (VideoContentProperty::CROP); film_content_changed (VideoContentProperty::COLOUR_CONVERSION); - film_content_changed (VideoContentProperty::VIDEO_FADE_IN); - film_content_changed (VideoContentProperty::VIDEO_FADE_OUT); + film_content_changed (VideoContentProperty::FADE_IN); + film_content_changed (VideoContentProperty::FADE_OUT); film_content_changed (FFmpegContentProperty::FILTERS); film_content_changed (DCPContentProperty::REFERENCE_VIDEO);