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

daemon: remove unused members from client and port structs

This commit is contained in:
Nedko Arnaudov 2010-03-30 23:10:23 +03:00
parent 9098a5a5f3
commit ad8eaa3323
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
daemon/client.c
View File

@ -29,14 +29,9 @@
struct ladish_client
{
struct list_head siblings_studio_all; /* link for the studio::all_clients list */
struct list_head siblings_room; /* link for the room::clients list */
struct list_head ports; /* List of ports that belong to the client */
uuid_t uuid; /* The UUID of the client */
uint64_t jack_id; /* JACK client ID */
char * jack_name; /* JACK name, not valid for virtual clients */
pid_t pid; /* process id. */
struct room * room_ptr; /* Room this client belongs to. If NULL, client belongs only to studio guts. */
ladish_dict_handle dict;
};
@ -70,13 +65,8 @@ ladish_client_create(
uuid_copy(client_ptr->uuid, uuid_ptr);
}
INIT_LIST_HEAD(&client_ptr->siblings_studio_all);
INIT_LIST_HEAD(&client_ptr->siblings_room);
INIT_LIST_HEAD(&client_ptr->ports);
client_ptr->jack_id = 0;
client_ptr->jack_name = NULL;
client_ptr->pid = 0;
client_ptr->room_ptr = NULL;
#if 0
{
@ -107,17 +97,8 @@ ladish_client_destroy(
{
log_info("client %p destroy", client_ptr);
ASSERT(list_empty(&client_ptr->ports));
ASSERT(list_empty(&client_ptr->siblings_studio_all));
ASSERT(list_empty(&client_ptr->siblings_room));
ladish_dict_destroy(client_ptr->dict);
if (client_ptr->jack_name != NULL)
{
free(client_ptr->jack_name);
}
free(client_ptr);
}

21
daemon/port.c
View File

@ -29,24 +29,9 @@
/* JACK port or virtual port */
struct ladish_port
{
struct list_head siblings_studio_all; /* link for the studio::all_ports list */
struct list_head siblings_studio; /* link for the studio::ports list */
struct list_head siblings_room; /* link for the room::ports list */
struct list_head siblings_client; /* link for the port list of the client */
struct list_head siblings_vclient; /* link for the port list of the virtual client */
uuid_t uuid; /* The UUID of the port */
bool virtual; /* Whether the port is virtual or JACK port */
char * jack_name; /* JACK name (short). Not valid for virtual ports. */
uint64_t jack_id; /* JACK port ID. Not valid for virtual ports. */
char * human_name; /* User assigned name */
struct client * client_ptr; /* JACK client this port belongs to. Not valid for virtual ports. */
struct client * vclient_ptr; /* Virtual client this port belongs to. NULL if there is no virtual client associated. */
/* superconnections are not in these lists */
struct list_head input_connections; /* list of input connections, i.e. connections that play to this port */
struct list_head output_connections; /* list of output connections, i.e. connections that capture from this port */
uint64_t jack_id; /* JACK port ID. zero for virtual ports. */
ladish_dict_handle dict;
};
@ -81,11 +66,7 @@ ladish_port_create(
uuid_copy(port_ptr->uuid, uuid_ptr);
}
INIT_LIST_HEAD(&port_ptr->siblings_studio_all);
INIT_LIST_HEAD(&port_ptr->siblings_room);
port_ptr->jack_id = 0;
port_ptr->jack_name = NULL;
port_ptr->human_name = NULL;
port_ptr->virtual = true;
log_info("port %p created", port_ptr);