/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
}
_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"));
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 ();
}