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

daemon: Fix for #97 

Try to supply alternative fake strings if mapping fails
This commit is contained in:
Nedko Arnaudov 2010-07-23 03:59:12 +03:00
parent 9a1015f50f
commit 399aaeaaf1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon/virtualizer.c
View File

@ -504,6 +504,8 @@ port_appeared(
goto exit;
}
jack_client_name = ladish_graph_get_client_name(virtualizer_ptr->jack_graph, jack_client);
ladish_client_get_uuid(jack_client, jclient_uuid);
is_a2j = uuid_compare(jclient_uuid, g_a2j_uuid) == 0;
if (is_a2j)
@ -512,6 +514,20 @@ port_appeared(
if (!a2j_proxy_map_jack_port(real_jack_port_name, &alsa_client_name, &alsa_port_name, &alsa_client_id))
{
is_a2j = false;
alsa_client_name = catdup("FAILED ", jack_client_name);
if (alsa_client_name == NULL)
{
log_error("catdup failed to duplicate a2j jack client name after map failure");
goto exit;
}
alsa_port_name = strdup(real_jack_port_name);
if (alsa_port_name == NULL)
{
log_error("catdup failed to duplicate a2j jack port name after map failure");
free(alsa_client_name);
goto exit;
}
}
else
{
@ -532,8 +548,6 @@ port_appeared(
jack_port_name = real_jack_port_name;
}
jack_client_name = ladish_graph_get_client_name(virtualizer_ptr->jack_graph, jack_client);
/********************/
/* search (by name) the appeared port in jack graph