Cleanup

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

common/JackAPI.cpp

@@ -48,7 +48,11 @@ extern "C"
 {
 #endif
 
-    EXPORT int jack_client_name_size (void);
+    EXPORT jack_client_t * jack_client_open (const char *client_name,
+            jack_options_t options,
+            jack_status_t *status, ...);
+    EXPORT jack_client_t * jack_client_new (const char *client_name);
+	EXPORT int jack_client_name_size (void);
     EXPORT char* jack_get_client_name (jack_client_t *client);
     EXPORT int jack_internal_client_new (const char *client_name,
                                          const char *load_name,
@@ -245,6 +249,15 @@ EXPORT void jack_set_error_function (void (*func)(const char *))
     jack_error_callback = func;
 }
 
+EXPORT jack_client_t* jack_client_new(const char* client_name)
+{
+    int options = JackUseExactName;
+    if (getenv("JACK_START_SERVER") == NULL)
+        options |= JackNoStartServer;
+
+    return jack_client_open(client_name, (jack_options_t)options, NULL);
+}
+
 EXPORT void* jack_port_get_buffer(jack_port_t* port, jack_nframes_t frames)
 {
 #ifdef __CLIENTDEBUG__

common/JackLibAPI.cpp

@@ -42,7 +42,6 @@ extern "C"
     EXPORT jack_client_t * jack_client_open (const char *client_name,
             jack_options_t options,
             jack_status_t *status, ...);
-    EXPORT jack_client_t * jack_client_new (const char *client_name);
     EXPORT int jack_client_close (jack_client_t *client);
 
 #ifdef __cplusplus
@@ -52,11 +51,6 @@ extern "C"
 JackLibGlobals* JackLibGlobals::fGlobals = NULL;
 long JackLibGlobals::fClientCount = 0;
 
-static inline bool CheckPort(jack_port_id_t port_index)
-{
-    return (port_index < PORT_NUM);
-}
-
 EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
 {
     va_list ap;				/* variable argument pointer */
@@ -79,7 +73,6 @@ EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options
     }
 
     /* parse variable arguments */
-	
     va_start(ap, status);
     jack_varargs_parse(options, ap, &va);
     va_end(ap);
@@ -123,15 +116,6 @@ EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options
     }
 }
 
-EXPORT jack_client_t* jack_client_new(const char* client_name)
-{
-    int options = JackUseExactName;
-    if (getenv("JACK_START_SERVER") == NULL)
-        options |= JackNoStartServer;
-
-    return jack_client_open(client_name, (jack_options_t)options, NULL);
-}
-
 EXPORT int jack_client_close(jack_client_t* ext_client)
 {
     JackLog("jack_client_close\n");

common/JackServerAPI.cpp

@@ -45,7 +45,6 @@ extern "C"
     EXPORT jack_client_t * jack_client_open (const char *client_name,
             jack_options_t options,
             jack_status_t *status, ...);
-    EXPORT jack_client_t * jack_client_new (const char *client_name);
     EXPORT int jack_client_close (jack_client_t *client);
 
 #ifdef __cplusplus
@@ -54,15 +53,6 @@ extern "C"
 
 using namespace Jack;
 
-EXPORT jack_client_t* jack_client_new(const char* client_name)
-{
-    int options = JackUseExactName;
-    if (getenv("JACK_START_SERVER") == NULL)
-        options |= JackNoStartServer;
-
-    return jack_client_open(client_name, (jack_options_t)options, NULL);
-}
-
 EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
 {
     va_list ap;				/* variable argument pointer */