allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

move location where port handling stops during Mackie::Surface destructor

Browse Source
This commit is contained in:
Paul Davis
2015-10-09 11:12:28 -04:00
parent 6acd51d48e
commit 7e771c9fdc
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,18 +149,6 @@ Surface::~Surface ()
{
DEBUG_TRACE (DEBUG::MackieControl, "Surface::~Surface init\n");
// zero_all ();
// delete groups
for (Groups::iterator it = groups.begin(); it != groups.end(); ++it) {
delete it->second;
}
// delete controls
for (Controls::iterator it = controls.begin(); it != controls.end(); ++it) {
delete *it;
}
port_connection.disconnect ();
if (input_source) {
@@ -168,6 +156,16 @@ Surface::~Surface ()
input_source = 0;
}
// delete groups (strips)
for (Groups::iterator it = groups.begin(); it != groups.end(); ++it) {
delete it->second;
}
// delete controls (global buttons, master fader etc)
for (Controls::iterator it = controls.begin(); it != controls.end(); ++it) {
delete *it;
}
delete _jog_wheel;
delete _port;