Fix ToxAv's use of `struct Tox`.

* Fix `toxav_get_tox` to return tox, not messenger.
* Fix the casts from Tox* to Messenger* in toxav_old.c.
* Pass Tox instead of Messenger to public group AV callbacks.

1 files changed, 7 insertions, 2 deletions

diff --git a/toxav/groupav.h b/toxav/groupav.h
index 4d9efafb..31c9abba 100644
--- a/toxav/groupav.h
+++ b/toxav/groupav.h
@@ -21,12 +21,16 @@
 #define C_TOXCORE_TOXAV_GROUPAV_H
 
 #include "../toxcore/group.h"
+#include "../toxcore/tox.h"
 
 /* Audio encoding/decoding */
 #include <opus.h>
 
 #define GROUP_AUDIO_PACKET_ID 192
 
+// TODO(iphydf): Use this better typed one instead of the void-pointer one below.
+// typedef void audio_data_cb(Tox *tox, uint32_t groupnumber, uint32_t peernumber, const int16_t *pcm,
+//                            uint32_t samples, uint8_t channels, uint32_t sample_rate, void *userdata);
 typedef void audio_data_cb(void *tox, uint32_t groupnumber, uint32_t peernumber, const int16_t *pcm,
                            uint32_t samples, uint8_t channels, uint32_t sample_rate, void *userdata);
 
@@ -35,14 +39,15 @@ typedef void audio_data_cb(void *tox, uint32_t groupnumber, uint32_t peernumber,
  * return group number on success.
  * return -1 on failure.
  */
-int add_av_groupchat(const Logger *log, Group_Chats *g_c, audio_data_cb *audio_callback, void *userdata);
+int add_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, audio_data_cb *audio_callback, void *userdata);
 
 /* Join a AV group (you need to have been invited first.)
  *
  * returns group number on success
  * returns -1 on failure.
  */
-int join_av_groupchat(const Logger *log, Group_Chats *g_c, uint32_t friendnumber, const uint8_t *data, uint16_t length,
+int join_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t friendnumber, const uint8_t *data,
+                      uint16_t length,
                       audio_data_cb *audio_callback, void *userdata);