summaryrefslogtreecommitdiff
path: root/src/cmumble.h
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-09-22 22:16:38 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-09-22 22:22:59 +0200
commit6437a68ae0a92bcee64d6fc4586f345128fcb7c3 (patch)
tree7cde2fb2a19a9c8c6964260e729759e7445ddc0c /src/cmumble.h
parentb396ee26febb003374f877af841814940fefd034 (diff)
downloadcmumble-6437a68ae0a92bcee64d6fc4586f345128fcb7c3.tar.gz
cmumble-6437a68ae0a92bcee64d6fc4586f345128fcb7c3.tar.bz2
cmumble-6437a68ae0a92bcee64d6fc4586f345128fcb7c3.zip
Fixup async read by using GPollableInputStream instead of GSocket
With the GSource created from GSocket hacks were needed to get all events. GPollableInputStream is the interface implemented directly by GTlsInputStream.
Diffstat (limited to 'src/cmumble.h')
-rw-r--r--src/cmumble.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cmumble.h b/src/cmumble.h
index a6cc7f2..af8396a 100644
--- a/src/cmumble.h
+++ b/src/cmumble.h
@@ -25,7 +25,9 @@ struct context {
GSocketClient *sock_client;
GSocketConnection *conn;
GSocket *sock;
- GIOStream *iostream;
+
+ GPollableInputStream *input;
+ GOutputStream *output;
uint8_t celt_header_packet[sizeof(CELTHeader)];
CELTHeader celt_header;
@@ -72,7 +74,7 @@ typedef void (*callback_t)(ProtobufCMessage *msg, struct context *);
void
send_msg(struct context *ctx, ProtobufCMessage *msg);
-void
+int
recv_msg(struct context *ctx, const struct mumble_callbacks *callbacks);
#endif