diff options
author | mannol <eniz_vukovic@hotmail.com> | 2015-06-27 17:28:07 +0200 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2015-06-27 17:28:07 +0200 |
commit | 2ecb71bb1e02a3542700ba9e8bcc372e203b8437 (patch) | |
tree | cd0d6b6690da75191c8c14c0756e90f743785c3a /toxav | |
parent | 1ba55d0ca737c21b78471180e90e6e81780aa52c (diff) |
Renamed TOXAV_CALL_STATE to TOXAV_FRIEND_CALL_STATE
Diffstat (limited to 'toxav')
-rw-r--r-- | toxav/toxav.c | 4 | ||||
-rw-r--r-- | toxav/toxav.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/toxav/toxav.c b/toxav/toxav.c index 59afe654..8a39259a 100644 --- a/toxav/toxav.c +++ b/toxav/toxav.c | |||
@@ -1115,7 +1115,7 @@ int callback_end(void* toxav_inst, MSICall* call) | |||
1115 | ToxAV* toxav = toxav_inst; | 1115 | ToxAV* toxav = toxav_inst; |
1116 | pthread_mutex_lock(toxav->mutex); | 1116 | pthread_mutex_lock(toxav->mutex); |
1117 | 1117 | ||
1118 | invoke_call_state(toxav, call->friend_number, TOXAV_CALL_STATE_FINISHED); | 1118 | invoke_call_state(toxav, call->friend_number, TOXAV_FRIEND_CALL_STATE_FINISHED); |
1119 | 1119 | ||
1120 | call_kill_transmission(call->av_call); | 1120 | call_kill_transmission(call->av_call); |
1121 | call_remove(call->av_call); | 1121 | call_remove(call->av_call); |
@@ -1129,7 +1129,7 @@ int callback_error(void* toxav_inst, MSICall* call) | |||
1129 | ToxAV* toxav = toxav_inst; | 1129 | ToxAV* toxav = toxav_inst; |
1130 | pthread_mutex_lock(toxav->mutex); | 1130 | pthread_mutex_lock(toxav->mutex); |
1131 | 1131 | ||
1132 | invoke_call_state(toxav, call->friend_number, TOXAV_CALL_STATE_ERROR); | 1132 | invoke_call_state(toxav, call->friend_number, TOXAV_FRIEND_CALL_STATE_ERROR); |
1133 | 1133 | ||
1134 | call_kill_transmission(call->av_call); | 1134 | call_kill_transmission(call->av_call); |
1135 | call_remove(call->av_call); | 1135 | call_remove(call->av_call); |
diff --git a/toxav/toxav.h b/toxav/toxav.h index 917a6bf5..8362edb3 100644 --- a/toxav/toxav.h +++ b/toxav/toxav.h | |||
@@ -302,36 +302,36 @@ bool toxav_answer(ToxAV *toxAV, uint32_t friend_number, uint32_t audio_bit_rate, | |||
302 | * :: Call state graph | 302 | * :: Call state graph |
303 | * | 303 | * |
304 | ******************************************************************************/ | 304 | ******************************************************************************/ |
305 | enum TOXAV_CALL_STATE { | 305 | enum TOXAV_FRIEND_CALL_STATE { |
306 | /** | 306 | /** |
307 | * Set by the AV core if an error occurred on the remote end or if friend | 307 | * Set by the AV core if an error occurred on the remote end or if friend |
308 | * timed out. This is the final state after which no more state | 308 | * timed out. This is the final state after which no more state |
309 | * transitions can occur for the call. This call state will never be triggered | 309 | * transitions can occur for the call. This call state will never be triggered |
310 | * in combination with other call states. | 310 | * in combination with other call states. |
311 | */ | 311 | */ |
312 | TOXAV_CALL_STATE_ERROR = 1, | 312 | TOXAV_FRIEND_CALL_STATE_ERROR = 1, |
313 | /** | 313 | /** |
314 | * The call has finished. This is the final state after which no more state | 314 | * The call has finished. This is the final state after which no more state |
315 | * transitions can occur for the call. This call state will never be | 315 | * transitions can occur for the call. This call state will never be |
316 | * triggered in combination with other call states. | 316 | * triggered in combination with other call states. |
317 | */ | 317 | */ |
318 | TOXAV_CALL_STATE_FINISHED = 2, | 318 | TOXAV_FRIEND_CALL_STATE_FINISHED = 2, |
319 | /** | 319 | /** |
320 | * The flag that marks that friend is sending audio. | 320 | * The flag that marks that friend is sending audio. |
321 | */ | 321 | */ |
322 | TOXAV_CALL_STATE_SENDING_A = 4, | 322 | TOXAV_FRIEND_CALL_STATE_SENDING_A = 4, |
323 | /** | 323 | /** |
324 | * The flag that marks that friend is sending video. | 324 | * The flag that marks that friend is sending video. |
325 | */ | 325 | */ |
326 | TOXAV_CALL_STATE_SENDING_V = 8, | 326 | TOXAV_FRIEND_CALL_STATE_SENDING_V = 8, |
327 | /** | 327 | /** |
328 | * The flag that marks that friend is receiving audio. | 328 | * The flag that marks that friend is receiving audio. |
329 | */ | 329 | */ |
330 | TOXAV_CALL_STATE_RECEIVING_A = 16, | 330 | TOXAV_FRIEND_CALL_STATE_RECEIVING_A = 16, |
331 | /** | 331 | /** |
332 | * The flag that marks that friend is receiving video. | 332 | * The flag that marks that friend is receiving video. |
333 | */ | 333 | */ |
334 | TOXAV_CALL_STATE_RECEIVING_V = 32, | 334 | TOXAV_FRIEND_CALL_STATE_RECEIVING_V = 32, |
335 | }; | 335 | }; |
336 | 336 | ||
337 | 337 | ||