2015-08-27 Carl Hetherington <cth@carlh.net>
+ * Tidy up DCP content colour conversion
+ a bit.
+
* Fix creation of badly-named configuration
directories in some circumstances (#654).
, _kdm_valid (false)
{
read_directory (p);
- /* Default to no colour conversion for DCPs */
- unset_colour_conversion (false);
}
DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
string
DCPContent::identifier () const
{
- return SubtitleContent::identifier ();
+ SafeStringStream s;
+ s << VideoContent::identifier() << "_" << SubtitleContent::identifier ();
+ return s.str ();
}
void
{
SingleStreamAudioContent::add_properties (p);
}
+
+void
+DCPContent::set_default_colour_conversion ()
+{
+ /* Default to no colour conversion for DCPs */
+ unset_colour_conversion ();
+}
void as_xml (xmlpp::Node *) const;
std::string identifier () const;
+ void set_default_colour_conversion ();
+
/* SubtitleContent */
bool has_text_subtitles () const {