From 3273b352678b2a2383f57b96c9e965789c5bd192 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 26 Oct 2007 14:48:17 +0000
Subject: [PATCH] Cleanup

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

diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 88b52560..d5ba5a85 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -57,7 +57,7 @@ JackServer::JackServer(bool sync,  bool temporary, long timeout, bool rt, long p
     fFreewheelDriver = new JackThreadedDriver(new JackFreewheelDriver("freewheel", fEngine, fSynchroTable));
     fLoopbackDriver = new JackLoopbackDriver("loopback", fEngine, fSynchroTable);
     fChannel = JackGlobals::MakeServerChannel();
-    fState = new JackConnectionManager();
+    fConnectionState = new JackConnectionManager();
 	fFreewheel = false;
     fLoopback = loopback;
     fDriverInfo = NULL;
@@ -77,7 +77,7 @@ JackServer::~JackServer()
     delete fEngine;
     delete fChannel;
     delete fEngineControl;
-    delete fState;
+    delete fConnectionState;
     if (fDriverInfo) {
         UnloadDriverModule(fDriverInfo->handle);
         free(fDriverInfo);
@@ -253,7 +253,7 @@ int JackServer::SetFreewheel(bool onoff)
         } else {
             fFreewheel = false;
             fFreewheelDriver->Stop();
-            fGraphManager->Restore(fState);   // Restore previous connection state
+            fGraphManager->Restore(fConnectionState);   // Restore previous connection state
             fEngine->NotifyFreewheel(onoff);
             fFreewheelDriver->SetMaster(false);
             fEngineControl->InitFrameTime();
@@ -263,7 +263,7 @@ int JackServer::SetFreewheel(bool onoff)
         if (onoff) {
             fFreewheel = true;
             fAudioDriver->Stop();
-            fGraphManager->Save(fState);     // Save connection state
+            fGraphManager->Save(fConnectionState);     // Save connection state
             fGraphManager->DisconnectAllPorts(fAudioDriver->GetClientControl()->fRefNum);
             fEngine->NotifyFreewheel(onoff);
             fFreewheelDriver->SetMaster(true);
diff --git a/common/JackServer.h b/common/JackServer.h
index 4cf5e64a..9f922b91 100644
--- a/common/JackServer.h
+++ b/common/JackServer.h
@@ -54,7 +54,7 @@ class EXPORT JackServer
         JackEngineControl* fEngineControl;
         JackGraphManager* fGraphManager;
         JackServerChannelInterface* fChannel;
-        JackConnectionManager* fState;
+        JackConnectionManager* fConnectionState;
         JackSynchro* fSynchroTable[CLIENT_NUM];        
         bool fFreewheel;
         long fLoopback;