Make ToxAV stateless

1 files changed, 6 insertions, 7 deletions

diff --git a/toxav/audio.c b/toxav/audio.c
index 59d1554e..3fb0985e 100644
--- a/toxav/audio.c
+++ b/toxav/audio.c
@@ -43,7 +43,7 @@ bool reconfigure_audio_decoder(ACSession *ac, int32_t sampling_rate, int8_t chan
 
 
 
-ACSession *ac_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_audio_receive_frame_cb *cb, void *cb_data)
+ACSession *ac_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_audio_receive_frame_cb *cb)
 {
     ACSession *ac = calloc(sizeof(ACSession), 1);
 
@@ -97,8 +97,7 @@ ACSession *ac_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_audio_re
 
     ac->av = av;
     ac->friend_number = friend_number;
-    ac->acb.first = cb;
-    ac->acb.second = cb_data;
+    ac->on_audio_frame = cb;
 
     return ac;
 
@@ -125,7 +124,7 @@ void ac_kill(ACSession *ac)
     LOGGER_DEBUG(ac->log, "Terminated audio handler: %p", ac);
     free(ac);
 }
-void ac_iterate(ACSession *ac)
+void ac_iterate(ACSession *ac, void *userdata)
 {
     if (!ac) {
         return;
@@ -186,11 +185,11 @@ void ac_iterate(ACSession *ac)
 
         if (rc < 0) {
             LOGGER_WARNING(ac->log, "Decoding error: %s", opus_strerror(rc));
-        } else if (ac->acb.first) {
+        } else if (ac->on_audio_frame) {
             ac->lp_frame_duration = (rc * 1000) / ac->lp_sampling_rate;
 
-            ac->acb.first(ac->av, ac->friend_number, tmp, rc, ac->lp_channel_count,
-                          ac->lp_sampling_rate, ac->acb.second);
+            ac->on_audio_frame(ac->av, ac->friend_number, tmp, rc, ac->lp_channel_count,
+                               ac->lp_sampling_rate, userdata);
         }
 
         return;