src/usr.bin/aucat/sock.c - diff

Return to sock.c CVS log

Up to [local] / src / usr.bin / aucat

Diff for /src/usr.bin/aucat/Attic/sock.c between version 1.49 and 1.50

version 1.49, 2010/06/05 12:45:48

version 1.50, 2010/06/05 16:00:52

Line 409

sock_allocbuf(struct sock *f)

{

struct abuf *rbuf = NULL, *wbuf = NULL;

unsigned bufsz;

bufsz = f->bufsz + f->dev->bufsz / f->dev->round * f->round;

f->pstate = SOCK_START;

if (f->mode & AMSG_PLAY) {

rbuf = abuf_new(f->bufsz, &f->rpar);

rbuf = abuf_new(bufsz, &f->rpar);

aproc_setout(f->pipe.file.rproc, rbuf);

if (!ABUF_WOK(rbuf) || (f->pipe.file.state & FILE_EOF))

f->pstate = SOCK_READY;

f->rmax = bufsz * aparams_bpf(&f->rpar);

}

if (f->mode & AMSG_RECMASK) {

wbuf = abuf_new(f->bufsz, &f->wpar);

wbuf = abuf_new(bufsz, &f->wpar);

aproc_setin(f->pipe.file.wproc, wbuf);

f->walign = f->round;

f->wmax = 0;

}

f->delta = 0;

f->startpos = 0;

f->wmax = 0;

f->rmax = f->bufsz;

f->tickpending = 0;

f->startpending = 0;

#ifdef DEBUG

Line 433

Line 435

sock_dbg(f);

dbg_puts(": allocating ");

dbg_putu(f->bufsz);

dbg_puts("/");

dbg_putu(bufsz);

dbg_puts(" fr buffers, rmax = ");

dbg_putu(f->rmax);

dbg_puts("\n");

Line 926

Line 930

}

#endif

}

if (AMSG_ISSET(p->bufsz)) {

* XXX: bufsz will become read-only, but for now

* allow old library to properly work

#ifdef DEBUG

if (debug_level >= 1) {

sock_dbg(f);

dbg_puts(": legacy client using ");

dbg_putx(p->bufsz);

dbg_puts("fr total buffer size\n");

}

#endif

min = (f->dev->bufsz / f->dev->round) * f->round;

if (p->bufsz < min)

p->bufsz = min;

p->appbufsz = p->bufsz - min;

}

if (AMSG_ISSET(p->appbufsz)) {

rate = (f->mode & AMSG_PLAY) ? f->rpar.rate : f->wpar.rate;

min = 1;

Line 1508

Line 1494

AMSG_INIT(&f->wmsg);

f->wmsg.cmd = AMSG_POS;

f->wmsg.u.ts.delta = f->startpos;

f->rmax += f->startpos;

f->wtodo = sizeof(struct amsg);

f->wstate = SOCK_WMSG;

f->startpending = 0;