From e11d85964cbd9ae5b4d7e8f14eaefa4d1b76b275 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sat, 29 Mar 2008 14:09:04 +0000
Subject: [PATCH] Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2103 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackDriverLoader.h  |  2 ++
 common/JackLibClient.cpp   | 15 ++++++++++++---
 common/JackServerGlobals.h |  1 -
 common/driver_parse.h      | 32 --------------------------------
 4 files changed, 14 insertions(+), 36 deletions(-)
 delete mode 100644 common/driver_parse.h

diff --git a/common/JackDriverLoader.h b/common/JackDriverLoader.h
index 55ae3b13..6b75e2bf 100644
--- a/common/JackDriverLoader.h
+++ b/common/JackDriverLoader.h
@@ -61,5 +61,7 @@ EXPORT JSList * jack_drivers_load (JSList * drivers);
 
 jack_driver_info_t * jack_load_driver (jack_driver_desc_t * driver_desc);
 
+EXPORT int jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
+
 #endif
 
diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp
index 6554d010..a0dd7e53 100644
--- a/common/JackLibClient.cpp
+++ b/common/JackLibClient.cpp
@@ -29,19 +29,28 @@ namespace Jack
 // Used for external C API (JackAPI.cpp)
 JackGraphManager* GetGraphManager()
 {
-    return (JackLibGlobals::fGlobals) ? JackLibGlobals::fGlobals->fGraphManager : NULL;
+	if (JackLibGlobals::fGlobals) {
+		return JackLibGlobals::fGlobals->fGraphManager;
+	} else {
+		return NULL;
+    }
 }
 
 JackEngineControl* GetEngineControl()
 {
-    return (JackLibGlobals::fGlobals) ? JackLibGlobals::fGlobals->fEngineControl : NULL;
+  	if (JackLibGlobals::fGlobals) {
+		return JackLibGlobals::fGlobals->fEngineControl;
+	} else {
+		return NULL;
+    }
 }
 
 JackSynchro** GetSynchroTable()
 {
-    return (JackLibGlobals::fGlobals) ? JackLibGlobals::fGlobals->fSynchroTable : NULL;
+    return (JackLibGlobals::fGlobals ? JackLibGlobals::fGlobals->fSynchroTable : 0);
 }
 
+
 //-------------------
 // Client management
 //-------------------
diff --git a/common/JackServerGlobals.h b/common/JackServerGlobals.h
index 59be4ba1..41d16454 100644
--- a/common/JackServerGlobals.h
+++ b/common/JackServerGlobals.h
@@ -21,7 +21,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackServerGlobals__
 
 #include "driver_interface.h"
-#include "driver_parse.h"
 #include "JackDriverLoader.h"
 #include "JackServer.h"
 #include <assert.h>
diff --git a/common/driver_parse.h b/common/driver_parse.h
deleted file mode 100644
index 8ec74d68..00000000
--- a/common/driver_parse.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright (C) 2003 Bob Ham <rah@bash.sh
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __jack_driver_parse_h__
-#define __jack_driver_parse_h__
-
-#include "jslist.h"
-#include "driver_interface.h"
-#include "JackExports.h"
-
-EXPORT int
-jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
-
-#endif /* __jack_driver_parse_h__ */
-
-