Browse Source

fDriverInfo as an object in JackServer class.

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

+ 1
- 3
common/JackServer.cpp View File

@@ -57,7 +57,6 @@ JackServer::JackServer(bool sync, bool temporary, long timeout, bool rt, long pr
fEngine = new JackLockedEngine(fGraphManager, GetSynchroTable(), fEngineControl);
fFreewheelDriver = new JackThreadedDriver(new JackFreewheelDriver(fEngine, GetSynchroTable()));
fLoopbackDriver = new JackLoopbackDriver(fEngine, GetSynchroTable());
fDriverInfo = new JackDriverInfo();
fAudioDriver = NULL;
fFreewheel = false;
fLoopback = loopback;
@@ -73,7 +72,6 @@ JackServer::~JackServer()
delete fLoopbackDriver;
delete fEngine;
delete fEngineControl;
delete fDriverInfo;
}

int JackServer::Open(jack_driver_desc_t* driver_desc, JSList* driver_params)
@@ -91,7 +89,7 @@ int JackServer::Open(jack_driver_desc_t* driver_desc, JSList* driver_params)
goto fail_close2;
}

if ((fAudioDriver = fDriverInfo->Open(driver_desc, fEngine, GetSynchroTable(), driver_params)) == NULL) {
if ((fAudioDriver = fDriverInfo.Open(driver_desc, fEngine, GetSynchroTable(), driver_params)) == NULL) {
jack_error("Cannot initialize driver");
goto fail_close3;
}


+ 1
- 1
common/JackServer.h View File

@@ -47,7 +47,7 @@ class SERVER_EXPORT JackServer

private:

JackDriverInfo* fDriverInfo;
JackDriverInfo fDriverInfo;
JackDriverClientInterface* fAudioDriver;
JackDriverClientInterface* fFreewheelDriver;
JackDriverClientInterface* fLoopbackDriver;


+ 0
- 1
common/driver_interface.h View File

@@ -28,7 +28,6 @@ extern "C"
#include <limits.h>
#include "jslist.h"
#include "JackCompilerDeps.h"

#include "JackSystemDeps.h"

#define JACK_DRIVER_NAME_MAX 15


Loading…
Cancel
Save