ardour/livetrax
13
0
Fork 0
Code

avoid possible shared remote control IDs in large (>317 track) session

Browse Source
This commit is contained in:
Paul Davis 2015-03-16 13:00:09 -05:00
parent 7b1c7efc1c
commit 11a702149e
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk2_ardour/editor_routes.cc
View File

@ -871,10 +871,19 @@ EditorRoutes::reset_remote_control_ids ()
for (ri = rows.begin(); ri != rows.end(); ++ri) {
/* skip two special values */
if (rid == Route::MasterBusRemoteControlID) {
rid++;
}
if (rid == Route::MonitorBusRemoteControlID) {
rid++;
}
boost::shared_ptr<Route> route = (*ri)[_columns.route];
bool visible = (*ri)[_columns.visible];
if (!route->is_master() && !route->is_monitor()) {
uint32_t new_rid = (visible ? rid : invisible_key--);

11
gtk2_ardour/mixer_ui.cc
View File

@ -473,6 +473,17 @@ Mixer_UI::reset_remote_control_ids ()
uint32_t invisible_key = UINT32_MAX;
for (ri = rows.begin(); ri != rows.end(); ++ri) {
/* skip two special values */
if (rid == Route::MasterBusRemoteControlID) {
rid++;
}
if (rid == Route::MonitorBusRemoteControlID) {
rid++;
}
boost::shared_ptr<Route> route = (*ri)[track_columns.route];
bool visible = (*ri)[track_columns.visible];