Changeset 96967baa782846238353a1da5009008bb1d6222f

Timestamp:

03/21/10 16:48:04 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

2663de52611ff1c82c5bd97d0ac95172c99e1588

Parents:

09ae831171eae2d9183a1958513e6edc74c523ba

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-03-21T16:48:04Z+0200

Message:

Remove studio rooms on studio unload

Location:

daemon

Files:

• cmd_unload_studio.c (modified) (2 diffs)
• studio.c (modified) (1 diff)
• studio_internal.h (modified) (1 diff)

daemon/cmd_unload_studio.c

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -39 +39 @@
   ladish_graph_clear(g_studio.studio_graph, false);
   ladish_graph_clear(g_studio.jack_graph, true);
+
+  studio_remove_all_rooms();
 
   jack_conf_clear();

daemon/studio.c

@@ -932 +932 @@
 }
 
+void studio_remove_all_rooms(void)
+{
+  struct list_head * node_ptr;
+  ladish_room_handle room;
+
+  while (!list_empty(&g_studio.rooms))
+  {
+    node_ptr = g_studio.rooms.next;
+    list_del(node_ptr);
+    room = ladish_room_from_list_node(node_ptr);
+    ASSERT(g_studio.room_count > 0);
+    g_studio.room_count--;
+    emit_room_disappeared(room);
+    ladish_room_destroy(room);
+  }
+
+  ASSERT(g_studio.room_count == 0);
+}
+
 METHOD_ARGS_BEGIN(GetName, "Get studio name")
   METHOD_ARG_DESCRIBE_OUT("studio_name", "s", "Name of studio")

daemon/studio_internal.h

@@ -197 +197 @@
 void on_event_jack_started(void);
 void on_event_jack_stopped(void);
+void studio_remove_all_rooms(void);
 
 #endif /* #ifndef STUDIO_INTERNAL_H__B4CB73EC_8E89_401A_9E49_F0AEEF361D09__INCLUDED */