projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index e88fb022720d0c91e13d875b36ff6589c1eec0ce..3c8e5fefd5a587d7d57ef8f885031197f461e977 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-89,7
+89,9
@@
public:
void set_bottom_crop (int);
void set_scale (VideoContentScale);
void set_bottom_crop (int);
void set_scale (VideoContentScale);
+ void unset_colour_conversion ();
void set_colour_conversion (ColourConversion);
void set_colour_conversion (ColourConversion);
+ void set_default_colour_conversion ();
void set_fade_in (ContentTime);
void set_fade_out (ContentTime);
void set_fade_in (ContentTime);
void set_fade_out (ContentTime);
@@
-130,7
+132,7
@@
public:
return _scale;
}
return _scale;
}
-
ColourConversion
colour_conversion () const {
+
boost::optional<ColourConversion>
colour_conversion () const {
boost::mutex::scoped_lock lm (_mutex);
return _colour_conversion;
}
boost::mutex::scoped_lock lm (_mutex);
return _colour_conversion;
}
@@
-173,7
+175,7
@@
private:
VideoFrameType _video_frame_type;
Crop _crop;
VideoContentScale _scale;
VideoFrameType _video_frame_type;
Crop _crop;
VideoContentScale _scale;
-
ColourConversion
_colour_conversion;
+
boost::optional<ColourConversion>
_colour_conversion;
ContentTime _fade_in;
ContentTime _fade_out;
};
ContentTime _fade_in;
ContentTime _fade_out;
};