summaryrefslogtreecommitdiff
path: root/src/lib/video_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-05 23:17:16 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-05 23:17:16 +0000
commitd26296467bbf6bd1b2300dd862ce55fcd7f3d624 (patch)
tree125284d4686aa58710ce841a77da9b0f762af857 /src/lib/video_content.cc
parent249ae25148213a2ab5d76980133182e7f2521524 (diff)
Add simple copy and paste for content settings (#1051).
Diffstat (limited to 'src/lib/video_content.cc')
-rw-r--r--src/lib/video_content.cc19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index d4e814624..f78dab17e 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -531,12 +531,19 @@ VideoContent::set_fade_out (Frame t)
void
VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
{
- _colour_conversion = c->_colour_conversion;
- _frame_type = c->_frame_type;
- _crop = c->_crop;
- _scale = c->_scale;
- _fade_in = c->_fade_in;
- _fade_out = c->_fade_out;
+ if (c->_colour_conversion) {
+ set_colour_conversion (c->_colour_conversion.get());
+ } else {
+ unset_colour_conversion ();
+ }
+ set_frame_type (c->_frame_type);
+ set_left_crop (c->_crop.left);
+ set_right_crop (c->_crop.right);
+ set_top_crop (c->_crop.top);
+ set_bottom_crop (c->_crop.bottom);
+ set_scale (c->_scale);
+ set_fade_in (c->_fade_in);
+ set_fade_out (c->_fade_out);
}
void