Make ToxAV stateless

1 files changed, 29 insertions, 24 deletions

diff --git a/testing/av_test.c b/testing/av_test.c
index 28796abb..46212255 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -80,7 +80,9 @@ typedef struct {
 
 struct toxav_thread_data {
     ToxAV  *AliceAV;
+    void   *AliceCC;
     ToxAV  *BobAV;
+    void   *BobCC;
     int32_t sig;
 };
 
@@ -270,31 +272,32 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
 
 
     /* Alice */
-    toxav_callback_call(*AliceAV, t_toxav_call_cb, AliceCC);
-    toxav_callback_call_state(*AliceAV, t_toxav_call_state_cb, AliceCC);
-    toxav_callback_bit_rate_status(*AliceAV, t_toxav_bit_rate_status_cb, AliceCC);
-    toxav_callback_video_receive_frame(*AliceAV, t_toxav_receive_video_frame_cb, AliceCC);
-    toxav_callback_audio_receive_frame(*AliceAV, t_toxav_receive_audio_frame_cb, AliceCC);
+    toxav_callback_call(*AliceAV, t_toxav_call_cb);
+    toxav_callback_call_state(*AliceAV, t_toxav_call_state_cb);
+    toxav_callback_bit_rate_status(*AliceAV, t_toxav_bit_rate_status_cb);
+    toxav_callback_video_receive_frame(*AliceAV, t_toxav_receive_video_frame_cb);
+    toxav_callback_audio_receive_frame(*AliceAV, t_toxav_receive_audio_frame_cb);
 
     /* Bob */
-    toxav_callback_call(*BobAV, t_toxav_call_cb, BobCC);
-    toxav_callback_call_state(*BobAV, t_toxav_call_state_cb, BobCC);
-    toxav_callback_bit_rate_status(*BobAV, t_toxav_bit_rate_status_cb, BobCC);
-    toxav_callback_video_receive_frame(*BobAV, t_toxav_receive_video_frame_cb, BobCC);
-    toxav_callback_audio_receive_frame(*BobAV, t_toxav_receive_audio_frame_cb, BobCC);
+    toxav_callback_call(*BobAV, t_toxav_call_cb);
+    toxav_callback_call_state(*BobAV, t_toxav_call_state_cb);
+    toxav_callback_bit_rate_status(*BobAV, t_toxav_bit_rate_status_cb);
+    toxav_callback_video_receive_frame(*BobAV, t_toxav_receive_video_frame_cb);
+    toxav_callback_audio_receive_frame(*BobAV, t_toxav_receive_audio_frame_cb);
 
 
     printf("Created 2 instances of ToxAV\n");
     printf("All set after %llu seconds!\n", time(NULL) - cur_time);
 }
-static int iterate_tox(Tox *bootstrap, ToxAV *AliceAV, ToxAV *BobAV, void *userdata)
+static int iterate_tox(Tox *bootstrap, ToxAV *AliceAV, void *aCC, ToxAV *BobAV, void *bCC)
 {
-    tox_iterate(bootstrap, userdata);
-    tox_iterate(toxav_get_tox(AliceAV), userdata);
-    tox_iterate(toxav_get_tox(BobAV), userdata);
+    tox_iterate(bootstrap, NULL);
+    tox_iterate(toxav_get_tox(AliceAV), aCC);
+    tox_iterate(toxav_get_tox(BobAV), bCC);
 
     return MIN(tox_iteration_interval(toxav_get_tox(AliceAV)), tox_iteration_interval(toxav_get_tox(BobAV)));
 }
+
 static void *iterate_toxav(void *data)
 {
     struct toxav_thread_data *data_cast = data;
@@ -303,8 +306,8 @@ static void *iterate_toxav(void *data)
 #endif
 
     while (data_cast->sig == 0) {
-        toxav_iterate(data_cast->AliceAV);
-        toxav_iterate(data_cast->BobAV);
+        toxav_iterate(data_cast->AliceAV, data_cast->AliceCC);
+        toxav_iterate(data_cast->BobAV, data_cast->BobCC);
         int rc = MIN(toxav_iteration_interval(data_cast->AliceAV), toxav_iteration_interval(data_cast->BobAV));
 
         printf("\rIteration interval: %d            ", rc);
@@ -549,7 +552,7 @@ CHECK_ARG:
         }
 
         while (!BobCC.incoming) {
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
         }
 
         { /* Answer */
@@ -563,7 +566,7 @@ CHECK_ARG:
         }
 
         while (AliceCC.state == 0) {
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
         }
 
         /* Open audio file */
@@ -628,7 +631,7 @@ CHECK_ARG:
                 }
             }
 
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
             c_sleep((audio_frame_duration - (current_time_monotonic() - enc_start_time) - 1));
         }
 
@@ -647,7 +650,7 @@ CHECK_ARG:
             }
         }
 
-        iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
         assert(BobCC.state == TOXAV_FRIEND_CALL_STATE_FINISHED);
 
         /* Stop decode thread */
@@ -690,7 +693,7 @@ CHECK_ARG:
         }
 
         while (!BobCC.incoming) {
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
         }
 
         { /* Answer */
@@ -703,12 +706,14 @@ CHECK_ARG:
             }
         }
 
-        iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
 
         /* Start decode thread */
         struct toxav_thread_data data = {
             .AliceAV = AliceAV,
+            .AliceCC = &AliceCC,
             .BobAV = BobAV,
+            .BobCC = &BobCC,
             .sig = 0
         };
 
@@ -735,7 +740,7 @@ CHECK_ARG:
             }
 
             send_opencv_img(AliceAV, 0, frame);
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
             c_sleep(10);
         }
 
@@ -751,7 +756,7 @@ CHECK_ARG:
             }
         }
 
-        iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        iterate_tox(bootstrap, AliceAV, &AliceCC, BobAV, &BobCC);
         assert(BobCC.state == TOXAV_FRIEND_CALL_STATE_FINISHED);
 
         /* Stop decode thread */