Allow configurable start mode for player.

[dcpomatic.git] / src / lib / ffmpeg_content.h

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index f6553df1c47e53c3b1b65be5ca9045691ffaca0d..64f6f9ff8632a275cf05f2233b2faf344a2aadf6 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -55,7 +55,7 @@ public:
        }
 
        void examine (boost::shared_ptr<Job>);
-       void use_template (boost::shared_ptr<const Content> c);
+       void take_settings_from (boost::shared_ptr<const Content> c);
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
@@ -105,10 +105,10 @@ private:
        /** Video filters that should be used when generating DCPs */
        std::vector<Filter const *> _filters;
 
-       AVColorRange _color_range;
-       AVColorPrimaries _color_primaries;
-       AVColorTransferCharacteristic _color_trc;
-       AVColorSpace _colorspace;
+       boost::optional<AVColorRange> _color_range;
+       boost::optional<AVColorPrimaries> _color_primaries;
+       boost::optional<AVColorTransferCharacteristic> _color_trc;
+       boost::optional<AVColorSpace> _colorspace;
        boost::optional<int> _bits_per_pixel;
 };