Browse Source

Restore behaviour of LoopBack driver, which has to be opened in any case...

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1239 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.59
sletz 17 years ago
parent
commit
7aeb67be55
2 changed files with 7 additions and 4 deletions
  1. +4
    -0
      ChangeLog
  2. +3
    -4
      common/JackServer.cpp

+ 4
- 0
ChangeLog View File

@@ -2,6 +2,10 @@
Jackdmp changes log
---------------------------
2006-09-16 Stephane Letz <letz@grame.fr>
* Restore behaviour of LoopBack driver, which has to be opened in any case...
2006-09-15 Stephane Letz <letz@grame.fr>
* On Windows version, use signal to quit the server.


+ 3
- 4
common/JackServer.cpp View File

@@ -51,7 +51,7 @@ JackServer::JackServer(bool sync, long timeout, bool rt, long priority, long loo
fSignal = JackGlobals::MakeInterProcessSync();
fEngine = new JackEngine(fGraphManager, fSynchroTable, fEngineControl, fSignal, sync, timeout, rt, priority, verbose);
fFreewheelDriver = new JackThreadedDriver(new JackFreewheelDriver("freewheel", fEngine, fSynchroTable));
fLoopbackDriver = (loopback > 0) ? new JackLoopbackDriver("loopback", fEngine, fSynchroTable) : NULL;
fLoopbackDriver = new JackLoopbackDriver("loopback", fEngine, fSynchroTable);
fChannel = JackGlobals::MakeServerChannel();
fState = new JackConnectionManager();
fFreewheel = false;
@@ -111,7 +111,7 @@ int JackServer::Open(jack_driver_desc_t* driver_desc, JSList* driver_params)
}

// Before engine open
if (fLoopback > 0 && fLoopbackDriver->Open(fEngineControl->fBufferSize, fEngineControl->fSampleRate, 1, 1, fLoopback, fLoopback, false, "loopback", "loopback", 0, 0) != 0) {
if (fLoopbackDriver->Open(fEngineControl->fBufferSize, fEngineControl->fSampleRate, 1, 1, fLoopback, fLoopback, false, "loopback", "loopback", 0, 0) != 0) {
jack_error("Cannot open driver");
return -1;
}
@@ -155,8 +155,7 @@ int JackServer::Close()
fLoopbackDriver->Detach();
fAudioDriver->Close();
fFreewheelDriver->Close();
if (fLoopback > 0)
fLoopbackDriver->Close();
fLoopbackDriver->Close();
fEngine->Close();

#ifdef __APPLE__


Loading…
Cancel
Save