diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-08-27 14:19:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-08-27 14:19:28 +0100 |
| commit | 3feacf8bbdd094b7ac9a705911486288e436cd4f (patch) | |
| tree | 88acfc8dc8142572681f7cd9e7b3fab67ab0cae2 /src | |
| parent | 82efb1abd6a399917fa34a417039d58424236d23 (diff) | |
Tidy up DCP content colour conversion a bit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/dcp_content.cc | 13 | ||||
| -rw-r--r-- | src/lib/dcp_content.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index f0f1e321a..3c3d4983e 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -50,8 +50,6 @@ DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p) , _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) @@ -153,7 +151,9 @@ DCPContent::full_length () const string DCPContent::identifier () const { - return SubtitleContent::identifier (); + SafeStringStream s; + s << VideoContent::identifier() << "_" << SubtitleContent::identifier (); + return s.str (); } void @@ -190,3 +190,10 @@ DCPContent::add_properties (list<pair<string, string> >& p) const { SingleStreamAudioContent::add_properties (p); } + +void +DCPContent::set_default_colour_conversion () +{ + /* Default to no colour conversion for DCPs */ + unset_colour_conversion (); +} diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index b4aebc45e..410953eb7 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -57,6 +57,8 @@ public: void as_xml (xmlpp::Node *) const; std::string identifier () const; + void set_default_colour_conversion (); + /* SubtitleContent */ bool has_text_subtitles () const { |