Use of JackArgParser in audioadapter jack_initialize

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

common/JackAudioAdapter.cpp

@@ -20,6 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackAudioAdapter.h"
 #include "JackError.h"
 #include "JackExports.h"
+#include "JackTools.h"
 #include "jslist.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -105,6 +106,7 @@ extern "C"
 #endif
 
 #include "JackCallbackAudioAdapter.h"
+#include "driver_interface.h"
 
 #ifdef __linux__
 #include "JackAlsaAdapter.h"
@@ -121,6 +123,8 @@ extern "C"
 #define max(x,y) (((x)>(y)) ? (x) : (y))
 #define min(x,y) (((x)<(y)) ? (x) : (y))
 
+using namespace Jack;
+
     EXPORT int jack_internal_initialize(jack_client_t* jack_client, const JSList* params)
     {
         Jack::JackAudioAdapter* adapter;
@@ -173,8 +177,15 @@ extern "C"
 
 	EXPORT int jack_initialize(jack_client_t* jack_client, const char* load_init)
 	{
-        const JSList* params = NULL;
-        // TODO : convert load_init to params
+        JSList* params = NULL;
+        jack_driver_desc_t *desc = jack_get_descriptor();
+        JackArgParser parser(load_init);
+        
+        if (parser.GetArgc() > 0) {
+            if (jack_parse_driver_params(desc, parser.GetArgc(), (char**)parser.GetArgv(), &params) != 0) 
+            jack_error("Internal client jack_parse_driver_params error");
+        }
+         
         return jack_internal_initialize(jack_client, params);
     }
 

common/JackDriverLoader.h

@@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "driver_interface.h"
 #include "control_types.h"
 #include "JackPlatformSynchro.h"
-#include "jslist.h"
+
 
 #ifdef WIN32
 
@@ -64,7 +64,6 @@ jack_driver_desc_t * jack_find_driver_descriptor (JSList * drivers, const char *
 jack_driver_desc_t * jack_drivers_get_descriptor (JSList * drivers, const char * sofile);
 JSList * jack_drivers_load (JSList * drivers);
 jack_driver_info_t * jack_load_driver (jack_driver_desc_t * driver_desc);
-int jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
 EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
 
 #endif

common/JackTools.h

@@ -38,10 +38,12 @@
 #include <algorithm>
 #include <vector>
 
+#include "JackExports.h"
+
 namespace Jack
 {
 
-struct JackTools
+struct EXPORT JackTools
 {
 
     static int GetPID();
@@ -71,6 +73,7 @@ class EXPORT JackArgParser
         int GetArgc();
         const char** GetArgv();
 };
+
 }
 
 #endif

common/driver_interface.h

@@ -26,6 +26,8 @@ extern "C"
 #endif
 
 #include <limits.h>
+#include "jslist.h"
+#include "jackExports.h"
 
 #ifdef WIN32
 #include "types.h"
@@ -34,7 +36,6 @@ extern "C"
 #include <inttypes.h>
 #endif
 
-
 #define JACK_DRIVER_NAME_MAX          15
 #define JACK_DRIVER_PARAM_NAME_MAX    15
 #define JACK_DRIVER_PARAM_STRING_MAX  63
@@ -88,6 +89,8 @@ extern "C"
     jack_driver_desc_t;
 
 
+EXPORT int jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
+
 #ifdef __cplusplus
 }
 #endif

linux/alsa/JackAlsaAdapter.cpp

@@ -101,9 +101,6 @@ extern "C"
 {
 #endif
 
-#include "JackExports.h"
-#include "driver_interface.h"
-
     EXPORT jack_driver_desc_t* jack_get_descriptor()
     {
         jack_driver_desc_t *desc;

linux/alsa/JackAlsaAdapter.h

@@ -547,4 +547,18 @@ namespace Jack
    	};
 }
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "JackExports.h"
+#include "driver_interface.h"
+
+EXPORT jack_driver_desc_t* jack_get_descriptor();
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

macosx/JackCoreAudioAdapter.cpp

@@ -568,9 +568,6 @@ extern "C"
 {
 #endif
 
-#include "JackExports.h"
-#include "driver_interface.h"
-
    EXPORT jack_driver_desc_t* jack_get_descriptor() 
    {
         jack_driver_desc_t *desc;

macosx/JackCoreAudioAdapter.h

@@ -111,4 +111,18 @@ namespace Jack
    	};
 }
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "JackExports.h"
+#include "driver_interface.h"
+
+EXPORT jack_driver_desc_t* jack_get_descriptor();
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

windows/JackPortAudioAdapter.cpp

@@ -162,9 +162,6 @@ extern "C"
 {
 #endif
 
-#include "JackExports.h"
-#include "driver_interface.h"
-
     EXPORT jack_driver_desc_t* jack_get_descriptor()
     {
         jack_driver_desc_t *desc;

windows/JackPortAudioAdapter.h

@@ -58,4 +58,18 @@ namespace Jack
    	};
 }
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "JackExports.h"
+#include "driver_interface.h"
+
+EXPORT jack_driver_desc_t* jack_get_descriptor();
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif