Merged with trunk R1283.

NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 24 insertions, 19 deletions

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 60e7ec3f42..7ed6158b85 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -55,6 +55,7 @@ extern "C" int isnan (double);
 extern "C" int isinf (double);
 #endif
 
+#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (_session.engine().process_lock())
 
 using namespace std;
 using namespace ARDOUR;
@@ -339,7 +340,7 @@ IO::disconnect_input (Port* our_port, string other_port, void* src)
 	}
 
 	{ 
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -375,7 +376,7 @@ IO::connect_input (Port* our_port, string other_port, void* src)
 	}
 
 	{
-		Glib::Mutex::Lock em(_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -409,7 +410,7 @@ IO::disconnect_output (Port* our_port, string other_port, void* src)
 	}
 
 	{
-		Glib::Mutex::Lock em(_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -444,7 +445,8 @@ IO::connect_output (Port* our_port, string other_port, void* src)
 	}
 
 	{
-		Glib::Mutex::Lock em(_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
+
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -503,7 +505,8 @@ IO::remove_output_port (Port* port, void* src)
 	IOChange change (NoChange);
 
 	{
-		Glib::Mutex::Lock em(_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
+
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -554,7 +557,8 @@ IO::add_output_port (string destination, void* src, DataType type)
 		type = _default_type;
 
 	{
-		Glib::Mutex::Lock em(_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
+
 		
 		{ 
 			Glib::Mutex::Lock lm (io_lock);
@@ -605,7 +609,8 @@ IO::remove_input_port (Port* port, void* src)
 	IOChange change (NoChange);
 
 	{
-		Glib::Mutex::Lock em(_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
+
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -657,7 +662,7 @@ IO::add_input_port (string source, void* src, DataType type)
 		type = _default_type;
 
 	{
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		
 		{ 
 			Glib::Mutex::Lock lm (io_lock);
@@ -707,7 +712,7 @@ int
 IO::disconnect_inputs (void* src)
 {
 	{ 
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -729,7 +734,7 @@ int
 IO::disconnect_outputs (void* src)
 {
 	{
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		
 		{
 			Glib::Mutex::Lock lm (io_lock);
@@ -793,7 +798,7 @@ IO::ensure_inputs_locked (ChanCount count, bool clear, void* src)
 				setup_peak_meters ();
 				reset_panner ();
 				/* pass it on */
-				throw err;
+				throw AudioEngine::PortRegistrationFailure();
 			}
 
 			_inputs.add (input_port);
@@ -845,7 +850,7 @@ IO::ensure_io (ChanCount in, ChanCount out, bool clear, void* src)
 	}
 
 	{
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		Glib::Mutex::Lock lm (io_lock);
 
 		Port* port;
@@ -904,12 +909,12 @@ IO::ensure_io (ChanCount in, ChanCount out, bool clear, void* src)
 						return -1;
 					}
 				}
-
+				
 				catch (AudioEngine::PortRegistrationFailure& err) {
 					setup_peak_meters ();
 					reset_panner ();
 					/* pass it on */
-					throw err;
+					throw AudioEngine::PortRegistrationFailure();
 				}
 
 				_inputs.add (port);
@@ -941,7 +946,7 @@ IO::ensure_io (ChanCount in, ChanCount out, bool clear, void* src)
 					setup_peak_meters ();
 					reset_panner ();
 					/* pass it on */
-					throw err;
+					throw AudioEngine::PortRegistrationFailure ();
 				}
 
 				_outputs.add (port);
@@ -998,7 +1003,7 @@ IO::ensure_inputs (ChanCount count, bool clear, bool lockit, void* src)
 	}
 
 	if (lockit) {
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		Glib::Mutex::Lock im (io_lock);
 		changed = ensure_inputs_locked (count, clear, src);
 	} else {
@@ -1095,7 +1100,7 @@ IO::ensure_outputs (ChanCount count, bool clear, bool lockit, void* src)
 	/* XXX caller should hold io_lock, but generally doesn't */
 
 	if (lockit) {
-		Glib::Mutex::Lock em (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		Glib::Mutex::Lock im (io_lock);
 		changed = ensure_outputs_locked (count, clear, src);
 	} else {
@@ -1906,7 +1911,7 @@ IO::use_input_connection (Connection& c, void* src)
 	uint32_t limit;
 
 	{
-		Glib::Mutex::Lock lm (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		Glib::Mutex::Lock lm2 (io_lock);
 		
 		limit = c.nports();
@@ -1985,7 +1990,7 @@ IO::use_output_connection (Connection& c, void* src)
 	uint32_t limit;	
 
 	{
-		Glib::Mutex::Lock lm (_session.engine().process_lock());
+		BLOCK_PROCESS_CALLBACK ();
 		Glib::Mutex::Lock lm2 (io_lock);
 
 		limit = c.nports();