Merged with trunk R861

Possible new bugs - not very thoroughly tested, but at least functional at first glance


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

1 files changed, 10 insertions, 9 deletions

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 430801310d..0abc10648e 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -129,13 +129,13 @@ IO::IO (Session& s, string name,
 
 	_gain_automation_state = Off;
 	_gain_automation_style = Absolute;
-    
-    {
-        // IO::Meter is emitted from another thread so the
-        // Meter signal must be protected.
-        Glib::Mutex::Lock guard (m_meter_signal_lock);
-        m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter));
-    }
+
+	{
+		// IO::Meter is emitted from another thread so the
+		// Meter signal must be protected.
+		Glib::Mutex::Lock guard (m_meter_signal_lock);
+		m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter));
+	}
 	
 	// Connect to our own MoreChannels signal to connect output buffers
 	IO::MoreChannels.connect (mem_fun (*this, &IO::attach_buffers));
@@ -143,7 +143,8 @@ IO::IO (Session& s, string name,
 
 IO::~IO ()
 {
-    Glib::Mutex::Lock guard (m_meter_signal_lock);
+	Glib::Mutex::Lock guard (m_meter_signal_lock);
+	
 	Glib::Mutex::Lock lm (io_lock);
 
 	for (PortSet::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
@@ -154,7 +155,7 @@ IO::~IO ()
 		_session.engine().unregister_port (*i);
 	}
 
-    m_meter_connection.disconnect();
+	m_meter_connection.disconnect();
 
 	delete _meter;
 	delete _panner;