to fix the abort on shutdown bug, make sure SurfacePort destructor doesn't kill the mutex until readers & writers have finished.

git-svn-id: svn://localhost/ardour2/trunk@1572 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 4 deletions

diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
index 1c5c67ba55..05681c0c25 100644
--- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
@@ -88,7 +88,7 @@ void MackieControlProtocol::update_ports()
 
 			for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
 			{
-				cout << "adding port " << (*it)->port().name() << " to pollfd" << endl;
+				//cout << "adding port " << (*it)->port().name() << " to pollfd" << endl;
 				pfd[nfds].fd = (*it)->port().selectable();
 				pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
 				++nfds;
@@ -127,7 +127,7 @@ bool MackieControlProtocol::poll_ports()
 	if ( nfds < 1 )
 	{
 		lock.release();
-		cout << "poll_ports no ports" << endl;
+		//cout << "poll_ports no ports" << endl;
 		usleep( no_ports_sleep * 1000 );
 		return false;
 	}
@@ -180,13 +180,13 @@ void MackieControlProtocol::handle_port_active( SurfacePort * port )
 	// TODO but this is also done in set_active, and
 	// in fact update_surface won't execute unless
 	// _active == true
-	cout << "update_surface in handle_port_active" << endl;
+	//cout << "update_surface in handle_port_active" << endl;
 	update_surface();
 }
 
 void MackieControlProtocol::handle_port_init( Mackie::SurfacePort * sport )
 {
-	cout << "MackieControlProtocol::handle_port_init" << endl;
+	//cout << "MackieControlProtocol::handle_port_init" << endl;
 	_ports_changed = true;
 	update_ports();
 }