Browse Source

fix a couple of issues with port rename callback (duplicate structure members, missing break statement)

tags/0.125.0rc1
Paul Davis 10 years ago
parent
commit
54f1272d21
2 changed files with 4 additions and 5 deletions
  1. +3
    -2
      libjack/client.c
  2. +1
    -3
      libjack/local.h

+ 3
- 2
libjack/client.c View File

@@ -1885,9 +1885,10 @@ jack_client_process_events (jack_client_t* client)
if (key) {
free (key);
}
break;
case PortRename:
if (control->port_rename_cbset) {
client->port_rename_cb (event.y.other_id, event.x.name, event.z.other_name, client->port_rename_cb_arg);
client->port_rename_cb (event.y.other_id, event.x.name, event.z.other_name, client->port_rename_arg);
}
break;
}
@@ -2761,7 +2762,7 @@ jack_set_port_rename_callback (jack_client_t *client,
return -1;
}
client->port_rename_arg = arg;
client->port_rename = callback;
client->port_rename_cb = callback;
client->control->port_rename_cbset = (callback != NULL);
return 0;
}


+ 1
- 3
libjack/local.h View File

@@ -55,8 +55,6 @@ struct _jack_client {
void *bufsize_arg;
JackSampleRateCallback srate;
void *srate_arg;
JackPortRenameCallback port_rename;
void *port_rename_arg;
JackPortRegistrationCallback port_register;
void *port_register_arg;
JackPortConnectCallback port_connect;
@@ -82,7 +80,7 @@ struct _jack_client {
JackPropertyChangeCallback property_cb;
void *property_cb_arg;
JackPortRenameCallback port_rename_cb;
void *port_rename_cb_arg;
void *port_rename_arg;

/* external clients: set by libjack
* internal clients: set by engine */


Loading…
Cancel
Save