, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (Config::instance()->default_scale ())
{
- set_default_colour_conversion ();
+ set_default_colour_conversion (false);
}
VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (Config::instance()->default_scale ())
{
- set_default_colour_conversion ();
+ set_default_colour_conversion (false);
}
VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
, _video_frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (Config::instance()->default_scale ())
{
- set_default_colour_conversion ();
+ set_default_colour_conversion (false);
}
VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
}
void
-VideoContent::set_default_colour_conversion ()
+VideoContent::set_default_colour_conversion (bool signal)
{
- set_colour_conversion (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion);
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+ }
+
+ if (signal) {
+ signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+ }
}
void
void set_scale (VideoContentScale);
void unset_colour_conversion ();
void set_colour_conversion (ColourConversion);
- void set_default_colour_conversion ();
+ void set_default_colour_conversion (bool signal = true);
void set_fade_in (ContentTime);
void set_fade_out (ContentTime);