diff options
Diffstat (limited to 'src/cmumble.c')
-rw-r--r-- | src/cmumble.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/cmumble.c b/src/cmumble.c index 640b6ea..9e3d931 100644 --- a/src/cmumble.c +++ b/src/cmumble.c @@ -9,7 +9,7 @@ #include "util.h" static void -cmumble_read_audio_packet(struct cmumlbe *cm, uint8_t *data, size_t len) +cmumble_read_audio_packet(struct cmumble *cm, uint8_t *data, size_t len) { int64_t session, sequence; uint32_t pos = 1, read = 0; @@ -44,7 +44,7 @@ cmumble_read_audio_packet(struct cmumlbe *cm, uint8_t *data, size_t len) } void -cmumble_read_udp_data(struct cmumlbe *cm, guint8 *data, gsize size) +cmumble_read_udp_data(struct cmumble *cm, guint8 *data, gsize size) { guint num; gint64 timestamp; @@ -66,13 +66,13 @@ cmumble_read_udp_data(struct cmumlbe *cm, guint8 *data, gsize size) } static void -recv_udp_tunnel(MumbleProto__UDPTunnel *tunnel, struct cmumlbe *cm) +recv_udp_tunnel(MumbleProto__UDPTunnel *tunnel, struct cmumble *cm) { cmumble_read_udp_data(cm, tunnel->packet.data, tunnel->packet.len); } static void -recv_version(MumbleProto__Version *version, struct cmumlbe *cm) +recv_version(MumbleProto__Version *version, struct cmumble *cm) { g_print("version: 0x%x\n", version->version); g_print("release: %s\n", version->release); @@ -80,7 +80,7 @@ recv_version(MumbleProto__Version *version, struct cmumlbe *cm) static void recv_channel_state(MumbleProto__ChannelState *state, - struct cmumlbe *cm) + struct cmumble *cm) { struct cmumble_channel *channel; @@ -111,7 +111,7 @@ recv_channel_state(MumbleProto__ChannelState *state, } static void -recv_server_sync(MumbleProto__ServerSync *sync, struct cmumlbe *cm) +recv_server_sync(MumbleProto__ServerSync *sync, struct cmumble *cm) { cm->session = sync->session; cm->user = find_user(cm, cm->session); @@ -122,7 +122,7 @@ recv_server_sync(MumbleProto__ServerSync *sync, struct cmumlbe *cm) } static void -recv_crypt_setup(MumbleProto__CryptSetup *crypt, struct cmumlbe *cm) +recv_crypt_setup(MumbleProto__CryptSetup *crypt, struct cmumble *cm) { g_return_if_fail(crypt->key.len == 16 && crypt->client_nonce.len == 16 && @@ -139,14 +139,14 @@ recv_crypt_setup(MumbleProto__CryptSetup *crypt, struct cmumlbe *cm) static void recv_codec_version(MumbleProto__CodecVersion *codec, - struct cmumlbe *cm) + struct cmumble *cm) { g_print("Codec Version: alpha: %d, beta: %d, pefer_alpha: %d\n", codec->alpha, codec->beta, codec->prefer_alpha); } static void -recv_user_remove(MumbleProto__UserRemove *remove, struct cmumlbe *cm) +recv_user_remove(MumbleProto__UserRemove *remove, struct cmumble *cm) { struct cmumble_user *user = NULL; @@ -160,7 +160,7 @@ recv_user_remove(MumbleProto__UserRemove *remove, struct cmumlbe *cm) } static void -recv_user_state(MumbleProto__UserState *state, struct cmumlbe *cm) +recv_user_state(MumbleProto__UserState *state, struct cmumble *cm) { struct cmumble_user *user = NULL; @@ -190,7 +190,7 @@ recv_user_state(MumbleProto__UserState *state, struct cmumlbe *cm) } static void -recv_text_message(MumbleProto__TextMessage *text, struct cmumlbe *cm) +recv_text_message(MumbleProto__TextMessage *text, struct cmumble *cm) { struct cmumble_user *user; @@ -201,7 +201,7 @@ recv_text_message(MumbleProto__TextMessage *text, struct cmumlbe *cm) static const struct { #define MUMBLE_MSG(a,b) void (* a)(MumbleProto__##a *, \ - struct cmumlbe *); + struct cmumble *); MUMBLE_MSGS #undef MUMBLE_MSG } callbacks = { @@ -234,7 +234,7 @@ static const struct { }; static gboolean -do_ping(struct cmumlbe *cm) +do_ping(struct cmumble *cm) { MumbleProto__Ping ping; GTimeVal tv; @@ -249,7 +249,7 @@ do_ping(struct cmumlbe *cm) } void -cmumble_protocol_init(struct cmumlbe *cm) +cmumble_protocol_init(struct cmumble *cm) { MumbleProto__Version version; MumbleProto__Authenticate authenticate; @@ -296,7 +296,7 @@ static GOptionEntry entries[] = { int main(int argc, char **argv) { - struct cmumlbe cm; + struct cmumble cm; GError *error = NULL; GOptionContext *context; |