summaryrefslogtreecommitdiffstats
path: root/hosts
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-08-08 19:29:23 +0000
committerDavid Robillard <d@drobilla.net>2007-08-08 19:29:23 +0000
commit8bfc7210bb3e1043c1bebb5bc49aa2499cf84b02 (patch)
tree7a4f57cb8257cd98e363a8d0c2a38cedd22afcb8 /hosts
parenta8320bb94d1809ce2d4873d539fd8e936bc2fdbd (diff)
downloadlilv-8bfc7210bb3e1043c1bebb5bc49aa2499cf84b02.tar.gz
lilv-8bfc7210bb3e1043c1bebb5bc49aa2499cf84b02.tar.bz2
lilv-8bfc7210bb3e1043c1bebb5bc49aa2499cf84b02.zip
Update ingen for SLV2 changes.
SLV2 0.2.0. git-svn-id: http://svn.drobilla.net/lad/slv2@688 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'hosts')
-rw-r--r--hosts/lv2_jack_host.c18
-rw-r--r--hosts/lv2_simple_jack_host.c4
2 files changed, 11 insertions, 11 deletions
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c
index 660c14c..a92cb62 100644
--- a/hosts/lv2_jack_host.c
+++ b/hosts/lv2_jack_host.c
@@ -173,7 +173,7 @@ create_port(struct JackHost* host,
struct Port* const port = &host->ports[port_index];
port->direction = SLV2_PORT_DIRECTION_UNKNOWN;
- port->type = SLV2_PORT_TYPE_UNKNOWN;
+ port->type = SLV2_PORT_DATA_TYPE_UNKNOWN;
port->slv2_port = slv2_plugin_get_port_by_index(host->plugin, port_index);
port->jack_port = NULL;
port->control = 0.0f;
@@ -190,7 +190,7 @@ create_port(struct JackHost* host,
/* Get the (data) type of the port (control, audio, MIDI, OSC) */
port->type = slv2_port_get_data_type(host->plugin, port->slv2_port);
- if (port->type == SLV2_PORT_TYPE_CONTROL)
+ if (port->type == SLV2_PORT_DATA_TYPE_CONTROL)
port->control = slv2_port_get_default_value(host->plugin, port->slv2_port);
enum JackPortFlags jack_flags = 0;
@@ -206,21 +206,21 @@ create_port(struct JackHost* host,
}
/* Set control values */
- if (port->direction == SLV2_PORT_DIRECTION_INPUT && port->type == SLV2_PORT_TYPE_CONTROL) {
+ if (port->direction == SLV2_PORT_DIRECTION_INPUT && port->type == SLV2_PORT_DATA_TYPE_CONTROL) {
port->control = slv2_port_get_default_value(host->plugin, port->slv2_port);
printf("Set %s to %f\n", symbol, host->ports[port_index].control);
}
/* Connect the port based on it's type */
switch (port->type) {
- case SLV2_PORT_TYPE_CONTROL:
+ case SLV2_PORT_DATA_TYPE_CONTROL:
slv2_instance_connect_port(host->instance, port_index, &port->control);
break;
- case SLV2_PORT_TYPE_AUDIO:
+ case SLV2_PORT_DATA_TYPE_AUDIO:
port->jack_port = jack_port_register(host->jack_client,
symbol, JACK_DEFAULT_AUDIO_TYPE, jack_flags, 0);
break;
- case SLV2_PORT_TYPE_MIDI:
+ case SLV2_PORT_DATA_TYPE_MIDI:
port->jack_port = jack_port_register(host->jack_client,
symbol, JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0);
port->midi_buffer = lv2midi_new(MIDI_BUFFER_SIZE);
@@ -247,12 +247,12 @@ jack_process_cb(jack_nframes_t nframes, void* data)
if (!host->ports[p].jack_port)
continue;
- if (host->ports[p].type == SLV2_PORT_TYPE_AUDIO) {
+ if (host->ports[p].type == SLV2_PORT_DATA_TYPE_AUDIO) {
slv2_instance_connect_port(host->instance, p,
jack_port_get_buffer(host->ports[p].jack_port, nframes));
- } else if (host->ports[p].type == SLV2_PORT_TYPE_MIDI) {
+ } else if (host->ports[p].type == SLV2_PORT_DATA_TYPE_MIDI) {
lv2midi_reset_buffer(host->ports[p].midi_buffer);
@@ -287,7 +287,7 @@ jack_process_cb(jack_nframes_t nframes, void* data)
for (uint32_t p=0; p < host->num_ports; ++p) {
if (host->ports[p].jack_port
&& host->ports[p].direction == SLV2_PORT_DIRECTION_OUTPUT
- && host->ports[p].type == SLV2_PORT_TYPE_MIDI) {
+ && host->ports[p].type == SLV2_PORT_DATA_TYPE_MIDI) {
void* jack_buffer = jack_port_get_buffer(host->ports[p].jack_port, nframes);
diff --git a/hosts/lv2_simple_jack_host.c b/hosts/lv2_simple_jack_host.c
index 1c279ec..5543074 100644
--- a/hosts/lv2_simple_jack_host.c
+++ b/hosts/lv2_simple_jack_host.c
@@ -167,7 +167,7 @@ create_port(struct JackHost* host,
SLV2PortDataType type = slv2_port_get_data_type(host->plugin, port);
/* Connect control ports to controls array */
- if (type == SLV2_PORT_TYPE_CONTROL) {
+ if (type == SLV2_PORT_DATA_TYPE_CONTROL) {
/* Set default control values for inputs */
if (direction == SLV2_PORT_DIRECTION_INPUT) {
@@ -177,7 +177,7 @@ create_port(struct JackHost* host,
slv2_instance_connect_port(host->instance, index, &host->controls[index]);
- } else if (type == SLV2_PORT_TYPE_AUDIO) {
+ } else if (type == SLV2_PORT_DATA_TYPE_AUDIO) {
host->jack_ports[index] = jack_port_register(host->jack_client, symbol,
JACK_DEFAULT_AUDIO_TYPE,