Changeset 8aebce6821ae5d0266dcbc3de61ad34fe83e39e3

Timestamp:

11/07/10 23:43:45 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

6c2201b933ebc1d6c4049a3138d2e46aae3e56d7

Parents:

eb866bf6e8302d2fc26ac8c490d28ba9adc6bd67

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-07T23:43:36Z+0200

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-07T23:43:45Z+0200

Message:

ladishd: remove special a2j handling in remove/is_hidden[_app] virtualizer functions

a2j client has not app associated and thus should never be returned by ladish_graph_find_client_by_app()
This was somewhat possible in past, when the client was searched by name and not by uuid.

Also is_empty var is removed for ladish_graph_find_client_by_app(). For ladish_virtualizer_remove_app(),
the is_empty var is kept, because ladish_graph_client_is_empty() cannot be called after the client is removed
from the jack graph.

Files:

• daemon/virtualizer.c (modified) (6 diffs)

daemon/virtualizer.c

@@ -1126 +1126 @@
   uuid_t vclient_uuid;
   ladish_client_handle vclient;
-  bool is_empty;
   uuid_t jclient_uuid;
-  bool is_a2j;
 
   //ladish_graph_dump(g_studio.jack_graph);
@@ -1146 +1144 @@
 
   ladish_client_get_uuid(jclient, jclient_uuid);
-  is_a2j = uuid_compare(jclient_uuid, g_a2j_uuid) == 0;
-  is_empty = ladish_graph_client_is_empty(jack_graph, jclient);
+  ASSERT(uuid_compare(jclient_uuid, g_a2j_uuid) != 0); /* a2j client has no app associated */
 
   vgraph = ladish_client_get_vgraph(jclient);
@@ -1164 +1161 @@
   }
 
-  if (is_a2j)
-  {
-    /* The a2j jclient has no interlinked vclient */
-    return true;
-  }
-
   if (!ladish_client_get_interlink(jclient, vclient_uuid))
   {
-    if (is_empty)
+    if (ladish_graph_client_is_empty(jack_graph, jclient))
     {
       log_info("jack client of app '%s' has no interlinked vgraph client and no ports", app_name);
@@ -1274 +1265 @@
   bool is_empty;
   uuid_t jclient_uuid;
-  bool is_a2j;
   struct app_remove_context ctx;
 
@@ -1292 +1282 @@
 
   ladish_client_get_uuid(jclient, jclient_uuid);
-  is_a2j = uuid_compare(jclient_uuid, g_a2j_uuid) == 0;
-  is_empty = ladish_graph_client_is_empty(jack_graph, jclient);
+  ASSERT(uuid_compare(jclient_uuid, g_a2j_uuid) != 0); /* a2j client has no app associated */
 
   vgraph = ladish_client_get_vgraph(jclient);
@@ -1304 +1293 @@
   //ladish_graph_dump(vgraph);
 
+  /* check whether the client is empty because this cannot
+     be checked later because the client was removed
+     (see where is_empty is used) */
+  is_empty = ladish_graph_client_is_empty(jack_graph, jclient);
+
   ladish_graph_remove_client(jack_graph, jclient);
-
-  if (is_a2j)
-  {
-    /* The a2j jclient has no interlinked vclient */
-    return;
-  }
 
   if (!ladish_client_get_interlink(jclient, vclient_uuid))