summaryrefslogtreecommitdiff
path: root/libs/ardour/io.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-11-12 22:23:01 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-11-12 22:23:01 +0000
commitb01bdb7e70f021da764e81a4b55722e746e4885d (patch)
tree3f22af0fc8399bedd6843f7a9a4383295ac7b3cb /libs/ardour/io.cc
parent99d002dbdf2563bcad880628e7876aebe191ba0c (diff)
merged with trunk revs 2605-2627
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/io.cc')
-rw-r--r--libs/ardour/io.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index f64528aa52..fdb2e0f5cd 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -199,12 +199,11 @@ IO::IO (Session& s, const XMLNode& node, DataType dt)
IO::~IO ()
{
- cerr << "Deleting IO called " << _name << endl;
-
Glib::Mutex::Lock guard (m_meter_signal_lock);
-
Glib::Mutex::Lock lm (io_lock);
+ BLOCK_PROCESS_CALLBACK ();
+
for (PortSet::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
_session.engine().unregister_port (*i);
}