diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 00:36:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 00:36:01 +0100 |
| commit | 8041bb9729662176eeb8d78ce4dac9dfb6896557 (patch) | |
| tree | 836ad1f31abbc18488c9a8d69ba19a79c8c4dbce /src | |
| parent | c8427a8043e430f71b83edcc22110e457f2b3c3c (diff) | |
c7f2d098e2c1201c84552a1972453e7b75a64c5d from master; Removed unused parameter from VideoContent::set_default_colour_conversion.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/video_content.cc | 18 | ||||
| -rw-r--r-- | src/lib/video_content.h | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 68db672f1..442ee703c 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -67,7 +67,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f) , _video_frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) { - set_default_colour_conversion (false); + set_default_colour_conversion (); } VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len) @@ -77,7 +77,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len , _video_frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) { - set_default_colour_conversion (false); + set_default_colour_conversion (); } VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p) @@ -87,7 +87,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p) , _video_frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) { - set_default_colour_conversion (false); + set_default_colour_conversion (); } VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version) @@ -203,16 +203,10 @@ VideoContent::as_xml (xmlpp::Node* node) const } void -VideoContent::set_default_colour_conversion (bool signal) +VideoContent::set_default_colour_conversion () { - { - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ()); - } - - if (signal) { - signal_changed (VideoContentProperty::COLOUR_CONVERSION); - } + boost::mutex::scoped_lock lm (_mutex); + _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ()); } void diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 792929419..0e9f20348 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -88,7 +88,7 @@ public: void set_scale (VideoContentScale); void unset_colour_conversion (bool signal = true); void set_colour_conversion (ColourConversion); - void set_default_colour_conversion (bool signal = true); + void set_default_colour_conversion (); void set_fade_in (ContentTime); void set_fade_out (ContentTime); |