fDriverInfo as an object in JackServer class.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2925 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackServer.cpp

@@ -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;
     }

common/JackServer.h

@@ -47,7 +47,7 @@ class SERVER_EXPORT JackServer
 
     private:
 
-        JackDriverInfo* fDriverInfo;
+        JackDriverInfo fDriverInfo;
         JackDriverClientInterface* fAudioDriver;
         JackDriverClientInterface* fFreewheelDriver;
         JackDriverClientInterface* fLoopbackDriver;

common/driver_interface.h

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