diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-07 22:31:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-07 22:31:49 +0000 |
| commit | 7a0ad051a6d3c790acdd49a5a2e5c8dd4d9ec30d (patch) | |
| tree | 2c2d9fbe4a4948ec0411bb5c96ae8f8cc8646c12 | |
| parent | ac21bd2c34fc2a88a3af5fbf30ca0f081df9a42f (diff) | |
make reconnect to JACK work, after the _priv_jack fixes were added recently
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5753 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/audioengine.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index bc528b2146..f151815ba6 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1133,8 +1133,6 @@ AudioEngine::disconnect_from_jack () int AudioEngine::reconnect_to_jack () { - GET_PRIVATE_JACK_POINTER_RET (_jack,-1); - if (_running) { disconnect_from_jack (); /* XXX give jackd a chance */ @@ -1146,8 +1144,13 @@ AudioEngine::reconnect_to_jack () return -1; } - Ports::iterator i; + /* Now that we're connected again, we can get a private + pointer to the jack client. + */ + GET_PRIVATE_JACK_POINTER_RET (_jack,-1); + + Ports::iterator i; boost::shared_ptr<Ports> p = ports.reader (); for (i = p->begin(); i != p->end(); ++i) { |