ardour/livetrax
13
0
Fork 0
Code

MCP: fix bad use of strips container

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11823 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-07 19:30:00 +00:00
parent f703a3cfd1
commit 05b36d0092
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -298,7 +298,7 @@ MackieControlProtocol::switch_banks (int initial)
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("remote id %1 connecting %2 to %3 with port %4\n", DEBUG_TRACE (DEBUG::MackieControl, string_compose ("remote id %1 connecting %2 to %3 with port %4\n",
route->remote_control_id(), route->name(), strip.name(), port_for_id(i))); route->remote_control_id(), route->name(), strip.name(), port_for_id(i)));
route_table[i] = route; set_route_table (1, route);
RouteSignal * rs = new RouteSignal (route, *this, strip, port_for_id(i)); RouteSignal * rs = new RouteSignal (route, *this, strip, port_for_id(i));
route_signals.push_back (rs); route_signals.push_back (rs);
// update strip from route // update strip from route

3
libs/surfaces/mackie/mackie_surface.cc
View File

@ -30,9 +30,6 @@ Mackie::MackieSurface::init_controls()
// intialise groups and strips // intialise groups and strips
Group * group = 0; Group * group = 0;
// make sure there are enough strips
strips.resize (8);
group = new Group ("user"); group = new Group ("user");
groups["user"] = group; groups["user"] = group;

3
libs/surfaces/mackie/surface.cc
View File

@ -18,8 +18,11 @@ Surface::Surface( uint32_t max_strips, uint32_t unit_strips )
void Surface::init() void Surface::init()
{ {
DEBUG_TRACE (DEBUG::MackieControl, "Surface::init\n"); DEBUG_TRACE (DEBUG::MackieControl, "Surface::init\n");
strips.resize (_max_strips);
init_controls (); init_controls ();
init_strips (); init_strips ();
DEBUG_TRACE (DEBUG::MackieControl, "Surface::init finish\n"); DEBUG_TRACE (DEBUG::MackieControl, "Surface::init finish\n");
} }