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

[Summary] Fixed tracks i/o reconnectio issue

Browse source 
[Details] Tracks record enabling influented tracks order in processing list.
This processing list was used to connect/reconnect tracks i/o, which appears to be misdesing.
Fixed by creating a list sorted by track remoted id which reflacts it's position.
[Revieved by] Conceptualy discussed with Paul Davis

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 460733]
This commit is contained in:
Grygorii Zharun 2014-05-15 03:51:10 -05:00
parent 31fea08743
commit 38c5939e4c
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/ardour/session.cc
View file

@ -106,6 +106,13 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
namespace {
bool compare_roots_by_remote_id (const boost::shared_ptr<Route>& route1, const boost::shared_ptr<Route>& route2)
{
return route1->remote_control_id() < route2->remote_control_id();
}
}
bool Session::_disable_all_loaded_plugins = false;
PBD::Signal1<int,uint32_t> Session::AudioEngineSetupRequired;
@ -2109,9 +2116,8 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master)
//ChanCount inputs = ChanCount::ZERO;
//ChanCount outputs = ChanCount::ZERO;
resort_routes();
boost::shared_ptr<RouteList> existing_routes = routes.reader ();
RouteList existing_routes = *routes.reader ();
existing_routes.sort(compare_roots_by_remote_id);
{
PBD::Unwinder<bool> protect_ignore_changes (_reconnecting_routes_in_progress, true);
@ -2124,8 +2130,8 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master)
uint32_t input_n = 0;
uint32_t output_n = 0;
RouteList::iterator rIter = existing_routes->begin();
for (; rIter != existing_routes->end(); ++rIter) {
RouteList::iterator rIter = existing_routes.begin();
for (; rIter != existing_routes.end(); ++rIter) {
if (*rIter == _master_out || *rIter == _monitor_out) {
continue;