X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.h;h=93487d9e0c59dc09645278502df9a9011fcee034;hb=ccdcbaf61751aa59a4afb6828c513bedf11dcd37;hp=ba2082f9b52b71ca91229133c824da441bc44b58;hpb=820c23b9acd55999cc2e5777d5beeec8efd8970d;p=umurmur.git diff --git a/src/client.h b/src/client.h index ba2082f..93487d9 100644 --- a/src/client.h +++ b/src/client.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2009-2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. @@ -69,22 +69,27 @@ typedef struct { uint32_t rxcount, msgsize, drainleft, txcount, txsize; int sessionId; uint64_t key; - char *playerName; + char *username; bool_t authenticated, deaf, mute; char *os, *release; uint32_t version; int codec_count; - int32_t codecs[MAX_CODECS]; + struct dlist codecs; int availableBandwidth; etimer_t lastActivity; struct dlist node; struct dlist txMsgQueue; int txQueueCount; - /* Channel */ - void *channel; /*Ugly... */ + void *channel; /* Ugly... */ + char *context; struct dlist chan_node; + struct dlist voicetargets; } client_t; +typedef struct { + int codec, count; + struct dlist node; +} codec_t; void Client_init(); int Client_getfds(struct pollfd *pollfds); @@ -101,5 +106,8 @@ int Client_read_udp(void); void Client_disconnect_all(); int Client_voiceMsg(client_t *client, uint8_t *data, int len); void recheckCodecVersions(); +void Client_codec_add(client_t *client, int codec); +void Client_codec_free(client_t *client); +codec_t *Client_codec_iterate(client_t *client, codec_t **codec_itr); #endif