ratox

FIFO based tox client
Log | Files | Refs | README | LICENSE

commit add9f2a1bfa7ee3d225daae16046712d70d724cd
parent 287ddd66530dd04bf78939b896b92c7ac9c8d969
Author: z3bra <contactatz3bradotorg>
Date:   Thu Mar  2 22:36:24 +0100

Always append FCALL_IN when in a call

Diffstat:
ratox.c | 11+++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/ratox.c b/ratox.c @@ -1601,7 +1601,7 @@ loop(void) if (f->tx.state == TRANSFER_NONE) FD_APPEND(f->fd[FFILE_IN]); - if (!f->av.state || ((f->av.state & TRANSMITTING) && (f->av.state & OUTGOING))) + if (!f->av.state || (f->av.state & TRANSMITTING)) FD_APPEND(f->fd[FCALL_IN]); } FD_APPEND(f->fd[FREMOVE]); @@ -1762,6 +1762,11 @@ loop(void) fiforeset(f->dirfd, &f->fd[FCALL_IN], ffiles[FCALL_IN]); break; } + + f->av.state |= RINGING; + logmsg(": %s : Audio : Tx > Inviting\n", f->name); + } + if (!(f->av.state & OUTGOING)) { c0 = time(NULL); f->av.n = 0; f->av.lastsent.tv_sec = 0; @@ -1772,10 +1777,8 @@ loop(void) eprintf("malloc:"); f->av.state |= OUTGOING; - f->av.state |= RINGING; - logmsg(": %s : Audio : Tx > Inviting\n", f->name); } else { - if (f->av.state & OUTGOING) + if (f->av.state & TRANSMITTING) sendfriendcalldata(f); } }