diff options
-rw-r--r-- | auto_tests/toxav_basic_test.c | 12 | ||||
-rw-r--r-- | other/apidsl/toxav.in.h | 4 | ||||
-rw-r--r-- | toxav/toxav.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c index f859856d..41fb6787 100644 --- a/auto_tests/toxav_basic_test.c +++ b/auto_tests/toxav_basic_test.c | |||
@@ -392,25 +392,25 @@ START_TEST(test_AV_flows) | |||
392 | printf("Mute/Unmute single\n"); | 392 | printf("Mute/Unmute single\n"); |
393 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL)); | 393 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL)); |
394 | iterate_tox(bootstrap, Alice, Bob); | 394 | iterate_tox(bootstrap, Alice, Bob); |
395 | ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_RECEIVING_A); | 395 | ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); |
396 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL)); | 396 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL)); |
397 | iterate_tox(bootstrap, Alice, Bob); | 397 | iterate_tox(bootstrap, Alice, Bob); |
398 | ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_RECEIVING_A); | 398 | ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); |
399 | 399 | ||
400 | /* Mute/Unmute both */ | 400 | /* Mute/Unmute both */ |
401 | printf("Mute/Unmute both\n"); | 401 | printf("Mute/Unmute both\n"); |
402 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL)); | 402 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL)); |
403 | iterate_tox(bootstrap, Alice, Bob); | 403 | iterate_tox(bootstrap, Alice, Bob); |
404 | ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_RECEIVING_A); | 404 | ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); |
405 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_HIDE_VIDEO, NULL)); | 405 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_HIDE_VIDEO, NULL)); |
406 | iterate_tox(bootstrap, Alice, Bob); | 406 | iterate_tox(bootstrap, Alice, Bob); |
407 | ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_RECEIVING_V); | 407 | ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_ACCEPTING_V); |
408 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL)); | 408 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL)); |
409 | iterate_tox(bootstrap, Alice, Bob); | 409 | iterate_tox(bootstrap, Alice, Bob); |
410 | ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_RECEIVING_A); | 410 | ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); |
411 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_SHOW_VIDEO, NULL)); | 411 | ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_SHOW_VIDEO, NULL)); |
412 | iterate_tox(bootstrap, Alice, Bob); | 412 | iterate_tox(bootstrap, Alice, Bob); |
413 | ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_RECEIVING_V); | 413 | ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_ACCEPTING_V); |
414 | 414 | ||
415 | { | 415 | { |
416 | TOXAV_ERR_CALL_CONTROL rc; | 416 | TOXAV_ERR_CALL_CONTROL rc; |
diff --git a/other/apidsl/toxav.in.h b/other/apidsl/toxav.in.h index 4b328a30..22a01602 100644 --- a/other/apidsl/toxav.in.h +++ b/other/apidsl/toxav.in.h | |||
@@ -323,11 +323,11 @@ bitmask FRIEND_CALL_STATE { | |||
323 | /** | 323 | /** |
324 | * The flag that marks that friend is receiving audio. | 324 | * The flag that marks that friend is receiving audio. |
325 | */ | 325 | */ |
326 | RECEIVING_A, | 326 | ACCEPTING_A, |
327 | /** | 327 | /** |
328 | * The flag that marks that friend is receiving video. | 328 | * The flag that marks that friend is receiving video. |
329 | */ | 329 | */ |
330 | RECEIVING_V, | 330 | ACCEPTING_V, |
331 | } | 331 | } |
332 | event call_state { | 332 | event call_state { |
333 | /** | 333 | /** |
diff --git a/toxav/toxav.h b/toxav/toxav.h index 30ac66d1..3c745b36 100644 --- a/toxav/toxav.h +++ b/toxav/toxav.h | |||
@@ -329,11 +329,11 @@ enum TOXAV_FRIEND_CALL_STATE { | |||
329 | /** | 329 | /** |
330 | * The flag that marks that friend is receiving audio. | 330 | * The flag that marks that friend is receiving audio. |
331 | */ | 331 | */ |
332 | TOXAV_FRIEND_CALL_STATE_RECEIVING_A = 16, | 332 | TOXAV_FRIEND_CALL_STATE_ACCEPTING_A = 16, |
333 | /** | 333 | /** |
334 | * The flag that marks that friend is receiving video. | 334 | * The flag that marks that friend is receiving video. |
335 | */ | 335 | */ |
336 | TOXAV_FRIEND_CALL_STATE_RECEIVING_V = 32, | 336 | TOXAV_FRIEND_CALL_STATE_ACCEPTING_V = 32, |
337 | }; | 337 | }; |
338 | 338 | ||
339 | 339 | ||