smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 01:56:34 +01:00
Code Issues Projects Releases Wiki Activity

fix bad fix for cherry-pick conflict

Browse source
This commit is contained in:
Paul Davis 2015-02-05 16:49:14 -05:00
parent e8b6f852f6
commit c76523aeaa
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/session.cc
View file

@ -1424,10 +1424,10 @@ Session::location_added (Location *location)
if (location->is_skip()) { if (location->is_skip()) {
/* listen for per-location signals that require us to update skip-locate events */ /* listen for per-location signals that require us to update skip-locate events */
location->StartChanged.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, true)); location->StartChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true));
location->EndChanged.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, true)); location->EndChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true));
location->Changed.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, true)); location->Changed.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true));
location->FlagsChanged.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, false)); location->FlagsChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, false));
update_skips (location, true); update_skips (location, true);
} }