diff options
author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-11-21 23:11:36 +0100 |
---|---|---|
committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-11-22 08:25:04 +0100 |
commit | 19250ba1e16857c70cbbfe15b9e939b95e009896 (patch) | |
tree | 2bfd6228b1e65cefe584196566bbc40de6321d5b /src/commands.c | |
parent | 68992dfac34263d8da2ba9523342d92cbd6f6f98 (diff) | |
download | cmumble-19250ba1e16857c70cbbfe15b9e939b95e009896.tar.gz cmumble-19250ba1e16857c70cbbfe15b9e939b95e009896.tar.bz2 cmumble-19250ba1e16857c70cbbfe15b9e939b95e009896.zip |
Pass message type implicity in cmumble_send_*
This also removes the unneeded "struct mumble_*" which is ugly in use.
Diffstat (limited to 'src/commands.c')
-rw-r--r-- | src/commands.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/commands.c b/src/commands.c index 60e840f..83bc3f0 100644 --- a/src/commands.c +++ b/src/commands.c @@ -14,7 +14,7 @@ static void join_channel(struct cmumble *cm, int argc, char **argv) { - MumbleProto__UserState state; + mumble_user_state_t state; char *end; long num; @@ -29,13 +29,13 @@ join_channel(struct cmumble *cm, return; } - mumble_proto__user_state__init(&state); + cmumble_init_user_state(&state); state.channel_id = num; state.has_channel_id = 1; state.session = cm->session; state.has_session = 1; - cmumble_send_msg(cm, &state.base); + cmumble_send_user_state(cm, &state); } static void @@ -99,9 +99,9 @@ static void msg(struct cmumble *cm, int argc, char **argv) { - MumbleProto__TextMessage message; + mumble_text_message_t message; - mumble_proto__text_message__init(&message); + cmumble_init_text_message(&message); message.actor = cm->session; if (argc < 2) { @@ -122,7 +122,7 @@ msg(struct cmumble *cm, message.n_session = 0; message.n_tree_id = 0; - cmumble_send_msg(cm, &message.base); + cmumble_send_text_message(cm, &message); } static const struct cmumble_command commands[] = { |