summaryrefslogtreecommitdiff
path: root/auto_tests/toxav_many_test.c
diff options
context:
space:
mode:
Diffstat (limited to 'auto_tests/toxav_many_test.c')
-rw-r--r--auto_tests/toxav_many_test.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index a1688ac8..bdb5445b 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -113,17 +113,17 @@ static void t_accept_friend_request_cb(Tox *m, const uint8_t *public_key, const
113/** 113/**
114 * Iterate helper 114 * Iterate helper
115 */ 115 */
116static ToxAV *setup_av_instance(Tox *tox) 116static ToxAV *setup_av_instance(Tox *tox, CallControl *CC)
117{ 117{
118 TOXAV_ERR_NEW error; 118 TOXAV_ERR_NEW error;
119 119
120 ToxAV *av = toxav_new(tox, &error); 120 ToxAV *av = toxav_new(tox, &error);
121 ck_assert(error == TOXAV_ERR_NEW_OK); 121 ck_assert(error == TOXAV_ERR_NEW_OK);
122 122
123 toxav_callback_call(av, t_toxav_call_cb); 123 toxav_callback_call(av, t_toxav_call_cb, CC);
124 toxav_callback_call_state(av, t_toxav_call_state_cb); 124 toxav_callback_call_state(av, t_toxav_call_state_cb, CC);
125 toxav_callback_video_receive_frame(av, t_toxav_receive_video_frame_cb); 125 toxav_callback_video_receive_frame(av, t_toxav_receive_video_frame_cb, CC);
126 toxav_callback_audio_receive_frame(av, t_toxav_receive_audio_frame_cb); 126 toxav_callback_audio_receive_frame(av, t_toxav_receive_audio_frame_cb, CC);
127 127
128 return av; 128 return av;
129} 129}
@@ -172,8 +172,8 @@ static void *call_thread(void *pd)
172 time_t start_time = time(NULL); 172 time_t start_time = time(NULL);
173 173
174 while (time(NULL) - start_time < 4) { 174 while (time(NULL) - start_time < 4) {
175 toxav_iterate(AliceAV, &AliceCC); 175 toxav_iterate(AliceAV);
176 toxav_iterate(BobAV, &BobCC); 176 toxav_iterate(BobAV);
177 177
178 toxav_audio_send_frame(AliceAV, friend_number, PCM, 960, 1, 48000, NULL); 178 toxav_audio_send_frame(AliceAV, friend_number, PCM, 960, 1, 48000, NULL);
179 toxav_audio_send_frame(BobAV, 0, PCM, 960, 1, 48000, NULL); 179 toxav_audio_send_frame(BobAV, 0, PCM, 960, 1, 48000, NULL);
@@ -250,10 +250,10 @@ START_TEST(test_AV_three_calls)
250 250
251 while (1) { 251 while (1) {
252 tox_iterate(bootstrap, NULL); 252 tox_iterate(bootstrap, NULL);
253 tox_iterate(Alice, &AliceCC); 253 tox_iterate(Alice, NULL);
254 tox_iterate(Bobs[0], &BobsCC[0]); 254 tox_iterate(Bobs[0], NULL);
255 tox_iterate(Bobs[1], &BobsCC[1]); 255 tox_iterate(Bobs[1], NULL);
256 tox_iterate(Bobs[2], &BobsCC[2]); 256 tox_iterate(Bobs[2], NULL);
257 257
258 if (tox_self_get_connection_status(bootstrap) && 258 if (tox_self_get_connection_status(bootstrap) &&
259 tox_self_get_connection_status(Alice) && 259 tox_self_get_connection_status(Alice) &&
@@ -276,10 +276,10 @@ START_TEST(test_AV_three_calls)
276 c_sleep(20); 276 c_sleep(20);
277 } 277 }
278 278
279 AliceAV = setup_av_instance(Alice); 279 AliceAV = setup_av_instance(Alice, AliceCC);
280 BobsAV[0] = setup_av_instance(Bobs[0]); 280 BobsAV[0] = setup_av_instance(Bobs[0], BobsCC + 0);
281 BobsAV[1] = setup_av_instance(Bobs[1]); 281 BobsAV[1] = setup_av_instance(Bobs[1], BobsCC + 1);
282 BobsAV[2] = setup_av_instance(Bobs[2]); 282 BobsAV[2] = setup_av_instance(Bobs[2], BobsCC + 2);
283 283
284 printf("Created 4 instances of ToxAV\n"); 284 printf("Created 4 instances of ToxAV\n");
285 printf("All set after %llu seconds!\n", time(NULL) - cur_time); 285 printf("All set after %llu seconds!\n", time(NULL) - cur_time);
@@ -315,10 +315,10 @@ START_TEST(test_AV_three_calls)
315 time_t start_time = time(NULL); 315 time_t start_time = time(NULL);
316 316
317 while (time(NULL) - start_time < 5) { 317 while (time(NULL) - start_time < 5) {
318 tox_iterate(Alice, AliceCC); 318 tox_iterate(Alice, NULL);
319 tox_iterate(Bobs[0], &BobsCC[0]); 319 tox_iterate(Bobs[0], NULL);
320 tox_iterate(Bobs[1], &BobsCC[1]); 320 tox_iterate(Bobs[1], NULL);
321 tox_iterate(Bobs[2], &BobsCC[2]); 321 tox_iterate(Bobs[2], NULL);
322 c_sleep(20); 322 c_sleep(20);
323 } 323 }
324 324