c7f2d098e2c1201c84552a1972453e7b75a64c5d from master; Removed unused parameter from...

diff --git a/TO_PORT b/TO_PORT
index 8ec40ff3a96717d71f1f8e6dc96e14778fba2330..d63518670b11e5c2b1a74664eed4d5c70e935147 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,5 +1,3 @@
-21cb435ed5eb250a7f94887ddd75f6b367ea231f
-c7ec9dee8aa03ca86564d13f239dce0e498dc4bd
 823dc6064795fd128bcb2f0229202d507e289324
 994df155c9d1f6256cdcf51c355a74ebad24288b
 ccb883a479cb341c686fc4237763f483d15e1ec5
@@ -14,4 +12,6 @@ c13575f0483d6e92956fa7fb2e424572702236dc
 b41b6528fbe0d270415a8500a612da19469e49e4
 c040b70eb777630ef0fdbb80cd419f6b3da4b46e
 ea2becf3a859bc38c783d15f165d71f2ccb8c1d6
+Remove configurable colour conversion presets
+21cb435ed5eb250a7f94887ddd75f6b367ea231f
 Multi-stream audio stuff.

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 68db672f1894275b2ff0bbaedb5ca8c1d95435da..442ee703c01204d8e805fef786bde33dfee4ae3e 100644 (file)
--- 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 792929419c42f36e091efe40ef583df3eb20b7d3..0e9f20348635589210ae5204b1076c7a3b791420 100644 (file)
--- 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);