diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-27 17:42:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-27 17:42:09 +0000 |
| commit | 979a61eb3f1729affe1b0ab4201749b5cde11f68 (patch) | |
| tree | 9d65188b65ab2d1999b0bfe14315fd36575b333f /libs/ardour/io.cc | |
| parent | f3a833e38e669d3194652ddba40fa10377ff750a (diff) | |
remove (or attempt to remove) requirement for holding process lock when changing connections
git-svn-id: svn://localhost/ardour2/branches/3.0@8110 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/io.cc')
| -rw-r--r-- | libs/ardour/io.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 0609726b23..ebed41fd64 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -159,12 +159,9 @@ IO::check_bundles (std::vector<UserBundleInfo*>& list, const PortSet& ports) int IO::disconnect (Port* our_port, string other_port, void* src) { - assert (!AudioEngine::instance()->process_lock().trylock()); - if (other_port.length() == 0 || our_port == 0) { return 0; } - { Glib::Mutex::Lock lm (io_lock); @@ -196,8 +193,6 @@ IO::disconnect (Port* our_port, string other_port, void* src) int IO::connect (Port* our_port, string other_port, void* src) { - assert (!AudioEngine::instance()->process_lock().trylock()); - if (other_port.length() == 0 || our_port == 0) { return 0; } @@ -343,8 +338,6 @@ IO::add_port (string destination, void* src, DataType type) int IO::disconnect (void* src) { - BLOCK_PROCESS_CALLBACK (); - { Glib::Mutex::Lock lm (io_lock); |