From 15de512e56ccb5e5ff0e46a40cf2fcbc05ee2347 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 2 May 2014 18:43:04 -0400 Subject: [PATCH] changing the start (position) of a marker with a scene change needs to update the SceneChanger --- libs/ardour/location.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 90265af4e4..eef94797e9 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -188,6 +188,14 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) end_changed (this); /* EMIT SIGNAL */ } + /* moving the start (position) of a marker with a scene change + requires an update in the Scene Changer. + */ + + if (_scene_change) { + scene_changed (); /* EMIT SIGNAL */ + } + assert (_start >= 0); assert (_end >= 0); @@ -203,6 +211,7 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute) recompute_bbt_from_frames (); } start_changed (this); /* EMIT SIGNAL */ + if (is_session_range ()) { Session::StartTimeChanged (old); /* EMIT SIGNAL */ AudioFileSource::set_header_position_offset (s); @@ -536,10 +545,6 @@ Location::set_state (const XMLNode& node, int version) if (scene_child) { _scene_change = SceneChange::factory (*scene_child, version); - - if (_scene_change) { - _scene_change->set_time (_start); - } } recompute_bbt_from_frames ();