tUse av.state to check the current call state - ratox - FIFO based tox client
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 60d8ca29e1aa2be4261d51e0019e5f0615e2c238
(DIR) parent f10d276d4f89edf8bb5e432bfb96864219a6c20f
(HTM) Author: z3bra <contactatz3bradotorg>
Date: Tue, 8 Nov 2016 10:01:22 +0100
Use av.state to check the current call state
Diffstat:
M ratox.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/ratox.c b/ratox.c
t@@ -1324,8 +1324,8 @@ frienddestroy(struct friend *f)
canceltxtransfer(f);
cancelrxtransfer(f);
- if (f->av.num != -1 && toxav_get_call_state(toxav, f->av.num) != av_CallNonExistent)
- cancelcall(f, "Destroying"); /* todo: check state */
+ if (f->av.state > 0)
+ cancelcall(f, "Destroying");
for (i = 0; i < LEN(ffiles); i++) {
if (f->dirfd != -1) {
unlinkat(f->dirfd, ffiles[i].name, 0);
t@@ -1594,9 +1594,7 @@ loop(void)
if (f->tx.state == TRANSFER_NONE)
FD_APPEND(f->fd[FFILE_IN]);
- if (f->av.num < 0 ||
- (toxav_get_call_state(toxav, f->av.num) == av_CallActive &&
- f->av.state & TRANSMITTING))
+ if (f->av.state & TRANSMITTING)
FD_APPEND(f->fd[FCALL_IN]);
}
FD_APPEND(f->fd[FREMOVE]);
t@@ -1688,7 +1686,7 @@ loop(void)
if (!toxav_answer(toxav, f->av.num, AUDIOBITRATE, VIDEOBITRATE, NULL)) {
weprintf("Failed to answer call\n");
- if (!toxav_reject(toxav, f->av.num, NULL))
+ if (!toxav_call_control(toxav, f->num, TOXAV_CALL_CONTROL_CANCEL, NULL))
weprintf("Failed to reject call\n");
break;
}
t@@ -1763,8 +1761,7 @@ loop(void)
}
}
if (FD_ISSET(f->fd[FCALL_IN], &rfds)) {
- switch (toxav_get_call_state(toxav, f->av.num)) {
- case av_CallNonExistent:
+ if (f->av.state == 0) {
if (!toxav_call(toxav, f->num, AUDIOBITRATE, VIDEOBITRATE, NULL)) {
weprintf("Failed to call\n");
fiforeset(f->dirfd, &f->fd[FCALL_IN], ffiles[FCALL_IN]);
t@@ -1772,13 +1769,9 @@ loop(void)
}
f->av.state |= OUTGOING;
logmsg(": %s : Audio : Tx > Inviting\n", f->name);
- break;
- case av_CallActive:
+ } else {
f->av.state |= OUTGOING;
sendfriendcalldata(f);
- break;
- default:
- break;
}
}
if (FD_ISSET(f->fd[FREMOVE], &rfds))