LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow settings jack proxy callbacks from different modules

This commit is contained in:
Nedko Arnaudov 2009-08-11 14:01:40 +03:00
parent 6f14e65e0c
commit e9a72eb2fb
3 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
daemon/jack.c
View File

@ -159,21 +159,25 @@ jack_init(
{
bool started;
if (!jack_proxy_init(
on_jack_client_appeared,
on_jack_client_disappeared,
on_jack_port_appeared,
on_jack_port_disappeared,
on_jack_ports_connected,
on_jack_ports_disconnected,
on_jack_server_started,
on_jack_server_stopped,
on_jack_server_appeared,
on_jack_server_disappeared))
if (!jack_proxy_init())
{
return false;
}
jack_proxy_set_server_callbacks(
on_jack_server_started,
on_jack_server_stopped,
on_jack_server_appeared,
on_jack_server_disappeared);
jack_proxy_set_patchbay_callbacks(
on_jack_client_appeared,
on_jack_client_disappeared,
on_jack_port_appeared,
on_jack_port_disappeared,
on_jack_ports_connected,
on_jack_ports_disconnected);
if (jack_proxy_is_started(&started) && started)
{
on_jack_server_started();

42
jack_proxy.c
View File

@ -364,16 +364,7 @@ dbus_signal_handler(
bool
jack_proxy_init(
jack_proxy_callback_client_appeared client_appeared,
jack_proxy_callback_client_disappeared client_disappeared,
jack_proxy_callback_port_appeared port_appeared,
jack_proxy_callback_port_disappeared port_disappeared,
jack_proxy_callback_ports_connected ports_connected,
jack_proxy_callback_ports_disconnected ports_disconnected,
jack_proxy_callback_server_started server_started,
jack_proxy_callback_server_stopped server_stopped,
jack_proxy_callback_server_appeared server_appeared,
jack_proxy_callback_server_disappeared server_disappeared)
void)
{
DBusError err;
char rule[1024];
@ -443,18 +434,37 @@ jack_proxy_init(
return false;
}
return true;
}
void
jack_proxy_set_server_callbacks(
jack_proxy_callback_server_started server_started,
jack_proxy_callback_server_stopped server_stopped,
jack_proxy_callback_server_appeared server_appeared,
jack_proxy_callback_server_disappeared server_disappeared)
{
g_on_server_started = server_started;
g_on_server_stopped = server_stopped;
g_on_server_appeared = server_appeared;
g_on_server_disappeared = server_disappeared;
}
void
jack_proxy_set_patchbay_callbacks(
jack_proxy_callback_client_appeared client_appeared,
jack_proxy_callback_client_disappeared client_disappeared,
jack_proxy_callback_port_appeared port_appeared,
jack_proxy_callback_port_disappeared port_disappeared,
jack_proxy_callback_ports_connected ports_connected,
jack_proxy_callback_ports_disconnected ports_disconnected)
{
g_on_client_appeared = client_appeared;
g_on_client_disappeared = client_disappeared;
g_on_port_appeared = port_appeared;
g_on_port_disappeared = port_disappeared;
g_on_ports_connected = ports_connected;
g_on_ports_disconnected = ports_disconnected;
g_on_server_started = server_started;
g_on_server_stopped = server_stopped;
g_on_server_appeared = server_appeared;
g_on_server_disappeared = server_disappeared;
return true;
}
void

17
jack_proxy.h
View File

@ -124,16 +124,23 @@ void
bool
jack_proxy_init(
void);
void
jack_proxy_set_server_callbacks(
jack_proxy_callback_server_started server_started,
jack_proxy_callback_server_stopped server_stopped,
jack_proxy_callback_server_appeared server_appeared,
jack_proxy_callback_server_disappeared server_disappeared);
void
jack_proxy_set_patchbay_callbacks(
jack_proxy_callback_client_appeared client_appeared,
jack_proxy_callback_client_disappeared client_disappeared,
jack_proxy_callback_port_appeared port_appeared,
jack_proxy_callback_port_disappeared port_disappeared,
jack_proxy_callback_ports_connected ports_connected,
jack_proxy_callback_ports_disconnected ports_disconnected,
jack_proxy_callback_server_started server_started,
jack_proxy_callback_server_stopped server_stopped,
jack_proxy_callback_server_appeared server_appeared,
jack_proxy_callback_server_disappeared server_disappeared);
jack_proxy_callback_ports_disconnected ports_disconnected);
void
jack_proxy_uninit(