projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Step version
[umurmur.git]
/
src
/
client.h
diff --git
a/src/client.h
b/src/client.h
index 1239e557842181dc6fed7b5c46d5d4baaf4a458a..f7b88c492993a65144357151ead09a8f22990ada 100644
(file)
--- a/
src/client.h
+++ b/
src/client.h
@@
-1,4
+1,4
@@
-/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+/* Copyright (C) 20
09-20
10, Martin Johansson <martin@fatbob.nu>
Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
@@
-48,7
+48,7
@@
#include "timer.h"
#include "pds.h"
#include "timer.h"
#include "pds.h"
-#define BUFSIZE
2048
+#define BUFSIZE
8192
#define UDP_BUFSIZE 512
#define INACTICITY_TIMEOUT 15 /* Seconds */
#define MAX_CODECS 10
#define UDP_BUFSIZE 512
#define INACTICITY_TIMEOUT 15 /* Seconds */
#define MAX_CODECS 10
@@
-69,12
+69,12
@@
typedef struct {
uint32_t rxcount, msgsize, drainleft, txcount, txsize;
int sessionId;
uint64_t key;
uint32_t rxcount, msgsize, drainleft, txcount, txsize;
int sessionId;
uint64_t key;
- char *
playerN
ame;
- bool_t authenticated, deaf, mute;
+ char *
usern
ame;
+ bool_t
bUDP,
authenticated, deaf, mute;
char *os, *release;
uint32_t version;
int codec_count;
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;
int availableBandwidth;
etimer_t lastActivity;
struct dlist node;
@@
-86,6
+86,10
@@
typedef struct {
struct dlist voicetargets;
} client_t;
struct dlist voicetargets;
} client_t;
+typedef struct {
+ int codec, count;
+ struct dlist node;
+} codec_t;
void Client_init();
int Client_getfds(struct pollfd *pollfds);
void Client_init();
int Client_getfds(struct pollfd *pollfds);
@@
-102,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_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
#endif