From 7d5de68364f83662a19e45e6e3ab021414178df5 Mon Sep 17 00:00:00 2001 From: mannol Date: Fri, 10 Jul 2015 14:28:43 +0200 Subject: [PATCH] Fixed CALL_STATE naming --- auto_tests/toxav_basic_test.c | 12 ++++++------ other/apidsl/toxav.in.h | 4 ++-- 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) printf("Mute/Unmute single\n"); ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL)); iterate_tox(bootstrap, Alice, Bob); - ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_RECEIVING_A); + ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL)); iterate_tox(bootstrap, Alice, Bob); - ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_RECEIVING_A); + ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); /* Mute/Unmute both */ printf("Mute/Unmute both\n"); ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL)); iterate_tox(bootstrap, Alice, Bob); - ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_RECEIVING_A); + ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_HIDE_VIDEO, NULL)); iterate_tox(bootstrap, Alice, Bob); - ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_RECEIVING_V); + ck_assert(BobCC.state ^ TOXAV_FRIEND_CALL_STATE_ACCEPTING_V); ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL)); iterate_tox(bootstrap, Alice, Bob); - ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_RECEIVING_A); + ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_ACCEPTING_A); ck_assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_SHOW_VIDEO, NULL)); iterate_tox(bootstrap, Alice, Bob); - ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_RECEIVING_V); + ck_assert(BobCC.state & TOXAV_FRIEND_CALL_STATE_ACCEPTING_V); { 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 { /** * The flag that marks that friend is receiving audio. */ - RECEIVING_A, + ACCEPTING_A, /** * The flag that marks that friend is receiving video. */ - RECEIVING_V, + ACCEPTING_V, } event call_state { /** 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 { /** * The flag that marks that friend is receiving audio. */ - TOXAV_FRIEND_CALL_STATE_RECEIVING_A = 16, + TOXAV_FRIEND_CALL_STATE_ACCEPTING_A = 16, /** * The flag that marks that friend is receiving video. */ - TOXAV_FRIEND_CALL_STATE_RECEIVING_V = 32, + TOXAV_FRIEND_CALL_STATE_ACCEPTING_V = 32, };