projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f8e7d7
)
Prevent setting of negative trims by changing play length.
author
Carl Hetherington
<cth@carlh.net>
Wed, 27 Jun 2018 19:21:29 +0000
(20:21 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 27 Jun 2018 19:21:29 +0000
(20:21 +0100)
src/wx/timing_panel.cc
patch
|
blob
|
history
diff --git
a/src/wx/timing_panel.cc
b/src/wx/timing_panel.cc
index 653e4466955e55e880683cb054ee2daaa84afad7..4006c5d3e7625de67e7124172c1893508572c95f 100644
(file)
--- a/
src/wx/timing_panel.cc
+++ b/
src/wx/timing_panel.cc
@@
-395,7
+395,7
@@
TimingPanel::play_length_changed ()
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
i->set_trim_end (
- ContentTime (
i->full_length() - play_length
, frc) - i->trim_start ()
+ ContentTime (
max(DCPTime(), i->full_length() - play_length)
, frc) - i->trim_start ()
);
}
}