Changed slv2_port_get_type to slv2_port_get_data_type, and SLV2PortType to SLV2PortDataType.

Fixed autoconf warning.


git-svn-id: http://svn.drobilla.net/lad/slv2@682 a436a847-0d15-0410-975c-d299462d15a1

7 files changed, 16 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index 956ddfe..e677e5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,8 @@ AC_SUBST(SLV2_LIBS)
 CONFIG_H_PATH="$builddir/config/config.h"
 
 # Checks for compiler
-AC_PROG_CC
+#AC_PROG_CC
+AC_PROG_CC_C_O
 
 # Library building stuff
 AC_PROG_LIBTOOL
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c
index c185e87..660c14c 100644
--- a/hosts/lv2_jack_host.c
+++ b/hosts/lv2_jack_host.c
@@ -32,7 +32,7 @@
 
 struct Port {
 	SLV2PortDirection direction;
-	SLV2PortType      type;
+	SLV2PortDataType  type;
 	SLV2Port          slv2_port;
 	jack_port_t*      jack_port;   /**< For audio and MIDI ports, otherwise NULL */
 	float             control;     /**< For control ports, otherwise 0.0f */
@@ -188,7 +188,7 @@ create_port(struct JackHost* host,
 	port->direction = slv2_port_get_direction(host->plugin, port->slv2_port);
 	
 	/* Get the (data) type of the port (control, audio, MIDI, OSC) */
-	port->type = slv2_port_get_type(host->plugin, port->slv2_port);
+	port->type = slv2_port_get_data_type(host->plugin, port->slv2_port);
 
 	if (port->type == SLV2_PORT_TYPE_CONTROL)
 		port->control = slv2_port_get_default_value(host->plugin, port->slv2_port);
diff --git a/hosts/lv2_simple_jack_host.c b/hosts/lv2_simple_jack_host.c
index 4b1bcc3..1c279ec 100644
--- a/hosts/lv2_simple_jack_host.c
+++ b/hosts/lv2_simple_jack_host.c
@@ -164,7 +164,7 @@ create_port(struct JackHost* host,
 	SLV2PortDirection direction = slv2_port_get_direction(host->plugin, port);
 	
 	/* Get the (data) type of the port (control, audio, MIDI, OSC) */
-	SLV2PortType type = slv2_port_get_type(host->plugin, port);
+	SLV2PortDataType type = slv2_port_get_data_type(host->plugin, port);
 	
 	/* Connect control ports to controls array */
 	if (type == SLV2_PORT_TYPE_CONTROL) {
diff --git a/slv2/port.h b/slv2/port.h
index 08c1e45..3eef680 100644
--- a/slv2/port.h
+++ b/slv2/port.h
@@ -105,13 +105,13 @@ SLV2PortDirection
 slv2_port_get_direction(SLV2Plugin plugin,
                         SLV2Port   port);
 
-/** Get the (data) type of a port.
+/** Get the data type of a port.
  *
  * Time = Query
  */
-SLV2PortType
-slv2_port_get_type(SLV2Plugin plugin,
-                   SLV2Port   port);
+SLV2PortDataType
+slv2_port_get_data_type(SLV2Plugin plugin,
+                        SLV2Port   port);
 
 
 /** Get the default value of a port.
diff --git a/slv2/types.h b/slv2/types.h
index 4b1782d..275d7c4 100644
--- a/slv2/types.h
+++ b/slv2/types.h
@@ -35,13 +35,13 @@ extern "C" {
  * Further class information can be using slv2_port_get_value(p, "rdf:type")
  * or a custom query.
  */
-typedef enum _SLV2PortType {
+typedef enum _SLV2PortDataType {
 	SLV2_PORT_TYPE_UNKNOWN,
 	SLV2_PORT_TYPE_CONTROL, /**< One float per block */
 	SLV2_PORT_TYPE_AUDIO,   /**< One float per frame */
 	SLV2_PORT_TYPE_MIDI,    /**< A buffer of MIDI data (LL extension) */
 	SLV2_PORT_TYPE_OSC,     /**< A buffer of OSC data (DR extension) */
-} SLV2PortType;
+} SLV2PortDataType;
 
 /** Direction (input or output) of a port
  *
diff --git a/src/port.c b/src/port.c
index c1acf5e..fa28d93 100644
--- a/src/port.c
+++ b/src/port.c
@@ -91,13 +91,13 @@ slv2_port_get_direction(SLV2Plugin p,
 }
 
 
-SLV2PortType
-slv2_port_get_type(SLV2Plugin p,
-                   SLV2Port   port)
+SLV2PortDataType
+slv2_port_get_data_type(SLV2Plugin p,
+                        SLV2Port   port)
 {
 	SLV2Values type = slv2_port_get_value(p, port, "rdf:type");
 
-	SLV2PortType ret = SLV2_PORT_TYPE_UNKNOWN;
+	SLV2PortDataType ret = SLV2_PORT_TYPE_UNKNOWN;
 
 	if (!type)
 		return ret;
diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c
index 26c4cf5..abe0234 100644
--- a/utils/lv2_inspect.c
+++ b/utils/lv2_inspect.c
@@ -44,7 +44,7 @@ print_port(SLV2Plugin p, uint32_t index)
 			printf("Unknown");
 	}
 
-	SLV2PortType type = slv2_port_get_type(p, port);
+	SLV2PortDataType type = slv2_port_get_data_type(p, port);
 
 	printf("\n\t\tType:       ");
 	switch (type) {