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

daemon: ladish_studio_get_jack_graph() 

For use instead of ladish_studio_get_virtualizer()
because the later will return NULL when JACK server is stopped
This commit is contained in:
Nedko Arnaudov 2010-05-16 11:17:09 +03:00
parent 574962bfb0
commit 8925772da6
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/cmd_change_app_state.c
View File

@ -93,7 +93,7 @@ static bool run_target_stop(struct ladish_command_change_app_state * cmd_ptr, la
return true;
}
if (!ladish_virtualizer_is_hidden_app(ladish_studio_get_virtualizer(), app_name))
if (!ladish_virtualizer_is_hidden_app(ladish_studio_get_jack_graph(), app_name))
{
log_info("Waiting '%s' client disappear (%s)...", app_name, cmd_ptr->target_state_description);
return true;

5
daemon/studio.c
View File

@ -654,6 +654,11 @@ ladish_virtualizer_handle ladish_studio_get_virtualizer(void)
return g_studio.virtualizer;
}
ladish_graph_handle ladish_studio_get_jack_graph(void)
{
return g_studio.jack_graph;
}
struct ladish_studio_app_supervisor_match_context
{
const char * opath;

1
daemon/studio.h
View File

@ -55,6 +55,7 @@ void ladish_studio_stop_app_supervisors(void);
ladish_app_supervisor_handle ladish_studio_find_app_supervisor(const char * opath);
struct ladish_cqueue * ladish_studio_get_cmd_queue(void);
ladish_virtualizer_handle ladish_studio_get_virtualizer(void);
ladish_graph_handle ladish_studio_get_jack_graph(void);
void ladish_studio_emit_room_appeared(ladish_room_handle room);
void ladish_studio_emit_room_disappeared(ladish_room_handle room);

14
daemon/virtualizer.c
View File

@ -1037,7 +1037,7 @@ ladish_virtualizer_get_our_clients_count(
bool
ladish_virtualizer_is_hidden_app(
ladish_virtualizer_handle handle,
ladish_graph_handle jack_graph,
const char * app_name)
{
ladish_client_handle jclient;
@ -1047,7 +1047,7 @@ ladish_virtualizer_is_hidden_app(
//ladish_graph_dump(g_studio.jack_graph);
jclient = ladish_graph_find_client_by_name(virtualizer_ptr->jack_graph, app_name);
jclient = ladish_graph_find_client_by_name(jack_graph, app_name);
if (jclient == NULL)
{
ASSERT_NO_PASS;
@ -1063,8 +1063,8 @@ ladish_virtualizer_is_hidden_app(
//ladish_graph_dump(vgraph);
if (!ladish_graph_client_looks_empty(virtualizer_ptr->jack_graph, jclient) ||
!ladish_graph_client_is_hidden(virtualizer_ptr->jack_graph, jclient))
if (!ladish_graph_client_looks_empty(jack_graph, jclient) ||
!ladish_graph_client_is_hidden(jack_graph, jclient))
{
return false;
}
@ -1094,7 +1094,7 @@ ladish_virtualizer_is_hidden_app(
void
ladish_virtualizer_remove_app(
ladish_virtualizer_handle handle,
ladish_graph_handle jack_graph,
const char * app_name)
{
ladish_client_handle jclient;
@ -1104,7 +1104,7 @@ ladish_virtualizer_remove_app(
//ladish_graph_dump(g_studio.jack_graph);
jclient = ladish_graph_find_client_by_name(virtualizer_ptr->jack_graph, app_name);
jclient = ladish_graph_find_client_by_name(jack_graph, app_name);
if (jclient == NULL)
{
ASSERT_NO_PASS;
@ -1120,7 +1120,7 @@ ladish_virtualizer_remove_app(
//ladish_graph_dump(vgraph);
ladish_graph_remove_client(virtualizer_ptr->jack_graph, jclient);
ladish_graph_remove_client(jack_graph, jclient);
if (!ladish_client_get_interlink(jclient, vclient_uuid))
{
log_error("jack client of app '%s' has no interlinked vgraph client", app_name);

4
daemon/virtualizer.h
View File

@ -50,12 +50,12 @@ ladish_virtualizer_get_our_clients_count(
bool
ladish_virtualizer_is_hidden_app(
ladish_virtualizer_handle handle,
ladish_graph_handle graph_hanle,
const char * app_name);
void
ladish_virtualizer_remove_app(
ladish_virtualizer_handle handle,
ladish_graph_handle graph_hanle,
const char * app_name);
void