From 656d03fcca9789ffe919d5fe64a4b5462b94f6c8 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Sat, 28 May 2011 12:44:37 +0200
Subject: Move send_msg and recv_msg to messages.c

---
 src/cmumble.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 8 deletions(-)

(limited to 'src/cmumble.h')

diff --git a/src/cmumble.h b/src/cmumble.h
index 94ac8dd..baab8f3 100644
--- a/src/cmumble.h
+++ b/src/cmumble.h
@@ -1,21 +1,72 @@
 #ifndef _CMUMBLE_H_
 #define _CMUMBLE_H_
 
+#include <gst/gst.h>
+#include <gst/app/gstappsrc.h>
+#include <gst/app/gstappsink.h>
+#include <gst/app/gstappbuffer.h>
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+
+#include <celt/celt.h>
+#include <celt/celt_header.h>
+
+#include "mumble.pb-c.h"
 #include "messages.h"
 
+struct context {
+	GMainLoop *loop;
+
+	uint32_t session;
+	gboolean authenticated;
+
+	GSocketClient *sock_client;
+	GSocketConnection *conn;
+	GSocket *sock;
+	GIOStream *iostream;
+
+	uint8_t celt_header_packet[sizeof(CELTHeader)];
+	CELTHeader celt_header;
+	CELTMode *celt_mode;
+
+	GstElement *record_pipeline;
+	GstAppSink *sink;
+
+	int64_t sequence;
+
+	GList *users;
+};
+
+struct user {
+	uint32_t session;
+	char *name;
+	uint32_t user_id;
+
+	GstElement *pipeline;
+	GstAppSrc *src;
+};
+
+enum udp_message_type {
+	udp_voice_celt_alpha,
+	udp_ping,
+	udp_voice_speex,
+	udp_voice_celt_beta
+};
+
 enum mumble_message {
 #define MUMBLE_MSG(a,b,c) a,
 	MUMBLE_MSGS
 #undef MUMBLE_MSG
 };
 
-static const struct {
-	const ProtobufCMessageDescriptor *descriptor;
-	const char *name;
-} messages[] = {
-#define MUMBLE_MSG(a,b,c) { &mumble_proto_##b##__descriptor, c },
-	MUMBLE_MSGS
-#undef MUMBLE_MSG
-};
+typedef void (*callback_t)(ProtobufCMessage *msg, struct context *);
+
+void
+send_msg(struct context *ctx, ProtobufCMessage *msg);
+
+void
+recv_msg(struct context *ctx, const callback_t *callbacks, uint32_t callback_size);
 
 #endif
-- 
cgit