summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-09 15:38:44 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-09 15:38:44 +0100
commit78cece0461b94e5ffc4417f0228e0ad528ad8efe (patch)
tree92d28af8f0d03b001a5f8c6036fc0491bb5f4ff8 /src
parent661245c262558da01b6c587b94bc975d9f78e8e1 (diff)
Maintain frame-snap for position and trim when set_video_frame_rate is called (#1335).
Diffstat (limited to 'src')
-rw-r--r--src/lib/content.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc
index f2380653f..2e4e77f8d 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -360,6 +360,12 @@ Content::set_video_frame_rate (double r)
}
signal_changed (ContentProperty::VIDEO_FRAME_RATE);
+
+ /* Make sure things are still on frame boundaries */
+ if (video) {
+ set_position (position());
+ set_trim_start (trim_start());
+ }
}
void