From 730a0a42ae0a4428693c3b560044c777751939ce Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 20 Sep 2019 00:11:25 +0200 Subject: Add a warning log when an assertion gets hit. --- src/lib/player.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/player.cc b/src/lib/player.cc index 38c4beaae..cc8556f3d 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -636,7 +636,11 @@ Player::pass () /* Sometimes the thing that happened last finishes fractionally before or after this silence. Bodge the start time of the silence to fix it. */ - DCPOMATIC_ASSERT (labs(period.from.get() - _last_audio_time->get()) < 2); + int64_t const error = labs(period.from.get() - _last_audio_time->get()); + if (error >= 2) { + _film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR); + } + DCPOMATIC_ASSERT (error < 2); period.from = *_last_audio_time; } if (period.duration() > one_video_frame()) { -- cgit v1.2.3 From dcc46f2a5243bfdccf700d5f3ace85ff8cd569f8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 20 Sep 2019 10:22:10 +0200 Subject: Use content video frame rate rather than the DCP one when reading trim start/end back from the UI. See #1607. Backported from 3e6214d3dce7deceb98436e416747aaff72bf561 in v2.15.x. --- src/wx/timing_panel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index f10815ca4..d3bdc923d 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -404,7 +404,6 @@ TimingPanel::trim_start_changed () optional ref_frc; optional ref_ph; - ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { if (i->position() <= ph && ph < i->end(_parent->film())) { @@ -417,6 +416,7 @@ TimingPanel::trim_start_changed () ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get()); } + ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_start (trim); } @@ -437,8 +437,8 @@ TimingPanel::trim_end_changed () fv->set_coalesce_player_changes (true); - ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ()); BOOST_FOREACH (shared_ptr i, _parent->selected ()) { + ContentTime const trim = _trim_end->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); i->set_trim_end (trim); } -- cgit v1.2.3