From 4f6b91c4067eb4e944731113ff10b8175037a2d0 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 29 Jan 2007 16:16:54 +0000
Subject: [PATCH] Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1379 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackEngine.cpp          | 7 ++++---
 common/JackEngine.h            | 2 +-
 common/JackServer.cpp          | 5 +----
 common/JackServer.h            | 2 +-
 macosx/JackCoreAudioDriver.cpp | 3 +--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index 5bc567ba..cadedb7f 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -36,7 +36,6 @@ namespace Jack
 JackEngine::JackEngine(JackGraphManager* manager, 
 						JackSynchro** table, 
 						JackEngineControl* control,
-						JackSyncInterface* signal, 
 						bool sync, 
 						long time_out_ms, 
 						bool rt, 
@@ -52,8 +51,8 @@ JackEngine::JackEngine(JackGraphManager* manager,
     fEngineControl->fPriority = priority;
     fEngineControl->fVerbose = ve;
     fChannel = JackGlobals::MakeServerNotifyChannel();
+	fSignal = JackGlobals::MakeInterProcessSync();
     fEngineTiming = new JackEngineTiming(fClientTable, fGraphManager, fEngineControl);
-    fSignal = signal;
     for (int i = 0; i < CLIENT_NUM; i++)
         fClientTable[i] = NULL;
     fEngineTiming->ClearTimeMeasures();
@@ -64,6 +63,7 @@ JackEngine::~JackEngine()
 {
     delete fChannel;
     delete fEngineTiming;
+	delete fSignal;
 }
 
 //-------------------
@@ -98,7 +98,8 @@ int JackEngine::Close()
             delete client;
         }
     }
-
+	
+	fSignal->Destroy();
     return 0;
 }
 
diff --git a/common/JackEngine.h b/common/JackEngine.h
index c1cfa291..e2d2f8f5 100644
--- a/common/JackEngine.h
+++ b/common/JackEngine.h
@@ -64,7 +64,7 @@ class JackEngine
 
     public:
 
-        JackEngine(JackGraphManager* manager, JackSynchro** table, JackEngineControl* control, JackSyncInterface* signal, bool sync, long time_out_ms, bool rt, long priority, bool verbose);
+        JackEngine(JackGraphManager* manager, JackSynchro** table, JackEngineControl* control, bool sync, long time_out_ms, bool rt, long priority, bool verbose);
         virtual ~JackEngine();
 
         int Open();
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 62e94a23..61945648 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -52,8 +52,7 @@ JackServer::JackServer(bool sync, long timeout, bool rt, long priority, long loo
         fSynchroTable[i] = JackGlobals::MakeSynchro();
     fGraphManager = new JackGraphManager();
     fEngineControl = new JackEngineControl();
-    fSignal = JackGlobals::MakeInterProcessSync();
-    fEngine = new JackEngine(fGraphManager, fSynchroTable, fEngineControl, fSignal, sync, timeout, rt, priority, verbose);
+    fEngine = new JackEngine(fGraphManager, fSynchroTable, fEngineControl, sync, timeout, rt, priority, verbose);
     fFreewheelDriver = new JackThreadedDriver(new JackFreewheelDriver("freewheel", fEngine, fSynchroTable));
     fLoopbackDriver = new JackLoopbackDriver("loopback", fEngine, fSynchroTable);
     fChannel = JackGlobals::MakeServerChannel();
@@ -78,7 +77,6 @@ JackServer::~JackServer()
     delete fEngine;
     delete fChannel;
     delete fEngineControl;
-    delete fSignal;
     delete fState;
     if (fDriverInfo) {
         UnloadDriverModule(fDriverInfo->handle);
@@ -154,7 +152,6 @@ int JackServer::Close()
 {
     JackLog("JackServer::Close\n");
     fChannel->Close();
-    fSignal->Destroy(); // A REVOIR
     fAudioDriver->Detach();
     if (fLoopback > 0)
         fLoopbackDriver->Detach();
diff --git a/common/JackServer.h b/common/JackServer.h
index cd4e335c..77032960 100644
--- a/common/JackServer.h
+++ b/common/JackServer.h
@@ -56,7 +56,7 @@ class EXPORT JackServer
         JackServerChannelInterface* fChannel;
         JackConnectionManager* fState;
         JackSynchro* fSynchroTable[CLIENT_NUM];
-        JackSyncInterface* fSignal;
+        
         bool fSyncMode;
         bool fFreewheel;
         long fLoopback;
diff --git a/macosx/JackCoreAudioDriver.cpp b/macosx/JackCoreAudioDriver.cpp
index 534af9b7..82f128fb 100644
--- a/macosx/JackCoreAudioDriver.cpp
+++ b/macosx/JackCoreAudioDriver.cpp
@@ -879,11 +879,10 @@ int JackCoreAudioDriver::Attach()
 
 int JackCoreAudioDriver::Start()
 {
-    OSStatus err;
     JackLog("JackCoreAudioDriver::Start\n");
     JackAudioDriver::Start();
 
-    err = AudioDeviceAddIOProc(fDeviceID, MeasureCallback, this);
+    OSStatus err = AudioDeviceAddIOProc(fDeviceID, MeasureCallback, this);
     if (err != noErr)
         return -1;