summaryrefslogtreecommitdiff
path: root/toxav/toxav_old.c
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2016-10-28 20:31:58 +0100
committeriphydf <iphydf@users.noreply.github.com>2016-10-29 22:37:03 +0100
commita1af74fb7a3d0edd0a2b21a6ab018dd2a83d9ece (patch)
tree9f9c7e722428277fd57e1e1ea3c72b31f0e113e5 /toxav/toxav_old.c
parent59d27e6d941e429cf180ce66a5154e655fc5b77a (diff)
Rename some internal "group chat" things to "conference".
This is to allow new group chats to coexist with old group chats. We do not rename everything in group.[ch] to conference, yet, because it's not currently necessary, and a general internal API overhaul is due at some point anyway.
Diffstat (limited to 'toxav/toxav_old.c')
-rw-r--r--toxav/toxav_old.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/toxav/toxav_old.c b/toxav/toxav_old.c
index 63f81f96..d3e2f30d 100644
--- a/toxav/toxav_old.c
+++ b/toxav/toxav_old.c
@@ -40,7 +40,7 @@ int toxav_add_av_groupchat(struct Tox *tox, void (*audio_callback)(void *, int,
40 uint8_t, unsigned int, void *), void *userdata) 40 uint8_t, unsigned int, void *), void *userdata)
41{ 41{
42 Messenger *m = (Messenger *)tox; 42 Messenger *m = (Messenger *)tox;
43 return add_av_groupchat(m->log, (Group_Chats *)m->group_chat_object, 43 return add_av_groupchat(m->log, (Group_Chats *)m->conferences_object,
44 (void (*)(Messenger *, int, int, const int16_t *, unsigned int, uint8_t, unsigned int, void *))audio_callback, 44 (void (*)(Messenger *, int, int, const int16_t *, unsigned int, uint8_t, unsigned int, void *))audio_callback,
45 userdata); 45 userdata);
46} 46}
@@ -60,9 +60,9 @@ int toxav_join_av_groupchat(struct Tox *tox, int32_t friendnumber, const uint8_t
60 void *userdata) 60 void *userdata)
61{ 61{
62 Messenger *m = (Messenger *)tox; 62 Messenger *m = (Messenger *)tox;
63 return join_av_groupchat(m->log, (Group_Chats *)m->group_chat_object, friendnumber, data, length, (void (*)(Messenger *, 63 return join_av_groupchat(m->log, (Group_Chats *)m->conferences_object, friendnumber, data, length,
64 int, int, 64 (void (*)(Messenger *, int, int, const int16_t *, unsigned int, uint8_t, unsigned int, void *))audio_callback,
65 const int16_t *, unsigned int, uint8_t, unsigned int, void *))audio_callback, userdata); 65 userdata);
66} 66}
67 67
68/* Send audio to the group chat. 68/* Send audio to the group chat.
@@ -82,5 +82,5 @@ int toxav_group_send_audio(struct Tox *tox, int groupnumber, const int16_t *pcm,
82 unsigned int sample_rate) 82 unsigned int sample_rate)
83{ 83{
84 Messenger *m = (Messenger *)tox; 84 Messenger *m = (Messenger *)tox;
85 return group_send_audio((Group_Chats *)m->group_chat_object, groupnumber, pcm, samples, channels, sample_rate); 85 return group_send_audio((Group_Chats *)m->conferences_object, groupnumber, pcm, samples, channels, sample_rate);
86} 86}