Browse Source

Correct JackNetOneDriver::Close.

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

+ 1
- 0
ChangeLog View File

@@ -38,6 +38,7 @@ Valerio Pilo

* Merge newer-midi branch (Devin Anderson redesign of the MIDI drivers: alsarawmidi, ffado, coremidi and winmme).
* Cleanup JackThreadedDriver::Stop.
* Correct JackNetOneDriver::Close.

2011-03-30 Stephane Letz <letz@grame.fr>



+ 5
- 2
common/JackNetOneDriver.cpp View File

@@ -118,9 +118,12 @@ namespace Jack

int JackNetOneDriver::Close()
{
// Generic audio driver close
int res = JackAudioDriver::Close();

FreePorts();
netjack_release( &netj );
return JackDriver::Close();
netjack_release(&netj);
return res;
}

int JackNetOneDriver::Attach()


+ 1
- 1
common/JackServer.cpp View File

@@ -58,7 +58,7 @@ JackServer::JackServer(bool sync, bool temporary, int timeout, bool rt, int prio
new JackFreewheelDriver(fEngine, GetSynchroTable());
fThreadedFreewheelDriver = new JackThreadedDriver(freewheelDriver);

fFreewheelDriver = freewheelDriver;
fFreewheelDriver = freewheelDriver;
fDriverInfo = new JackDriverInfo();
fAudioDriver = NULL;
fFreewheel = false;


Loading…
Cancel
Save