removed glib dependency from the public api. we still need some helper functions to

access the useful things out of jack/port.h though...

also, removed conftest from the archive -- it's a build artifact


git-svn-id: svn+ssh://jackaudio.org/trunk/jack@40 0c269be4-1314-0410-8aa9-9f06e86f4224

Makefile.am

@@ -12,7 +12,7 @@ bin_PROGRAMS = jackd jack_simple_client jack_monitor_client @XTRA@
 
 AM_CFLAGS = $(JACK_CFLAGS) -DADDON_DIR=\"$(ADDON_DIR)\" @GLIB_CFLAGS@
 
-AM_CXXFLAGS = $(JACK_CFLAGS) -DADDON_DIR=\"$(ADDON_DIR)\" @GLIB_CFLAGS@
+AM_CXXFLAGS = $(JACK_CFLAGS) -DADDON_DIR=\"$(ADDON_DIR)\"
 
 jackd_SOURCES = jackd.c engine.c
 jackd_LDFLAGS = -L. -ljack -lltdl -lpthread $(GLIB_LIBS)

TODO

@@ -17,6 +17,4 @@ multiple port buffer shm segments (i.e. dynamically
          increase the total number of ports in the system)
 
 wingo (apwingo@eos.ncsu.edu) adds:
- - remove glib dependency from api. using it internally is one thing,
-   but the return value of one function (list_ports()) should not
-   introduce this dependency.
+ - add helper functions to access _jack_port_shared without requiring glib

conftest.c

@@ -1 +0,0 @@
-static int dummy;

fltk_client.cc

@@ -81,11 +81,11 @@ main (int argc, char *argv[])
 
 	printf ("client activated\n");
 
-	if (jack_port_connect (client, "ALSA I/O:Input 1", my_input_port->shared->name)) {
+	if (jack_port_connect (client, "ALSA I/O:Input 1", "myinput")) {
 		fprintf (stderr, "cannot connect input ports\n");
 	} 
 	
-	if (jack_port_connect (client, my_output_port->shared->name, "ALSA I/O:Output 1")) {
+	if (jack_port_connect (client, "myoutput", "ALSA I/O:Output 1")) {
 		fprintf (stderr, "cannot connect output ports\n");
 	} 
 

jack/jack.h

@@ -25,9 +25,7 @@
 extern "C" {
 #endif
 
-#include <glib.h>
 #include <jack/types.h>
-#include <jack/port.h>
 #include <jack/error.h>
 
 jack_client_t *jack_client_new (const char *client_name);
@@ -188,8 +186,8 @@ unsigned long jack_get_sample_rate (jack_client_t *);
 
 nframes_t jack_get_buffer_size (jack_client_t *);
 
-/* This function returns a list of ports that match the specified
-   arguments.
+/* This function returns a NULL-terminated array of ports that match the
+   specified arguments.
    
    port_name_pattern: a regular expression used to select ports by name.
                       if NULL or of zero length, no selection based on
@@ -203,10 +201,10 @@ nframes_t jack_get_buffer_size (jack_client_t *);
                       zero, no selection based on flags will be carried out.
 */
 
-GSList *jack_get_ports (jack_client_t *,
-			 const char *port_name_pattern,
-			 const char *type_name_pattern,
-			 unsigned long flags);
+jack_port_t **jack_get_ports (jack_client_t *,
+                              const char *port_name_pattern,
+                              const char *type_name_pattern,
+                              unsigned long flags);
 
 /* If a client is told to become the timebase for the entire system,
    it calls this function. If it returns zero, then the client has

monitor_client.c

@@ -3,6 +3,9 @@
 
 #include <jack/jack.h>
 
+#define TRUE 1
+#define FALSE 0
+
 int
 main (int argc, char *argv[])
 

simple_client.c

@@ -66,11 +66,11 @@ main (int argc, char *argv[])
 
 	printf ("client activated\n");
 
-	if (jack_port_connect (client, "ALSA I/O:Input 1", my_input_port->shared->name)) {
+	if (jack_port_connect (client, "ALSA I/O:Input 1", "myinput")) {
 		fprintf (stderr, "cannot connect input ports\n");
 	} 
 	
-	if (jack_port_connect (client, my_output_port->shared->name, "ALSA I/O:Output 1")) {
+	if (jack_port_connect (client, "myoutput", "ALSA I/O:Output 1")) {
 		fprintf (stderr, "cannot connect output ports\n");
 	}