Pd-cvs July 2007

pd-cvs@lists.iem.at

20 participants
623 discussions

pd/src d_soundfile.c, 1.4.4.11.2.10.2.12, 1.4.4.11.2.10.2.13
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10311 Modified Files: Tag: desiredata d_soundfile.c Log Message: cleanup Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.11.2.10.2.12 retrieving revision 1.4.4.11.2.10.2.13 diff -C2 -d -r1.4.4.11.2.10.2.12 -r1.4.4.11.2.10.2.13 *** d_soundfile.c 9 Jul 2007 20:08:58 -0000 1.4.4.11.2.10.2.12 --- d_soundfile.c 10 Jul 2007 05:50:22 -0000 1.4.4.11.2.10.2.13 *************** *** 153,158 **** /* this routine returns 1 if the high order byte comes at the lower ! address on our architecture (big-endianness.). It's 1 for Motorola, ! 0 for Intel: */ extern int garray_ambigendian(); --- 153,157 ---- /* this routine returns 1 if the high order byte comes at the lower ! address on our architecture (big-endianness.). It's 1 for Motorola, 0 for Intel: */ extern int garray_ambigendian(); *************** *** 187,194 **** */ ! int open_soundfile_via_fd(int fd, int headersize, ! int *p_bytespersamp, int *p_bigendian, int *p_nchannels, long *p_bytelimit, ! long skipframes) ! { int nchannels, bigendian, bytespersamp, swap, sysrtn; long bytelimit = 0x7fffffff; --- 186,191 ---- */ ! int open_soundfile_via_fd(int fd, int headersize, int *p_bytespersamp, int *p_bigendian, int *p_nchannels, long *p_bytelimit, ! long skipframes) { int nchannels, bigendian, bytespersamp, swap, sysrtn; long bytelimit = 0x7fffffff; *************** *** 241,246 **** /* read chunks in loop until we get to the data chunk */ while (strncmp(((t_wavechunk *)buf)->id, "data", 4)) { ! long chunksize = swap4(((t_wavechunk *)buf)->size, swap), ! seekto = headersize + chunksize + 8, seekout; if (!strncmp(((t_wavechunk *)buf)->id, "fmt ", 4)) { long commblockonset = headersize + 8; --- 238,242 ---- /* read chunks in loop until we get to the data chunk */ while (strncmp(((t_wavechunk *)buf)->id, "data", 4)) { ! long chunksize = swap4(((t_wavechunk *)buf)->size, swap), seekto = headersize + chunksize + 8, seekout; if (!strncmp(((t_wavechunk *)buf)->id, "fmt ", 4)) { long commblockonset = headersize + 8; *************** *** 393,403 **** arguments shouldn't be set but the calling routine flags this. */ static int soundfiler_writeargparse(void *obj, int *p_argc, t_atom **p_argv, t_symbol **p_filesym, ! int *p_filetype, int *p_bytespersamp, int *p_swap, int *p_bigendian, ! int *p_normalize, long *p_onset, long *p_nframes, float *p_rate) ! { int argc = *p_argc; t_atom *argv = *p_argv; ! int bytespersamp = 2, bigendian = 0, ! endianness = -1, swap, filetype = -1, normalize = 0; long onset = 0, nframes = 0x7fffffff; t_symbol *filesym; --- 389,397 ---- arguments shouldn't be set but the calling routine flags this. */ static int soundfiler_writeargparse(void *obj, int *p_argc, t_atom **p_argv, t_symbol **p_filesym, ! int *p_filetype, int *p_bytespersamp, int *p_swap, int *p_bigendian, ! int *p_normalize, long *p_onset, long *p_nframes, float *p_rate) { int argc = *p_argc; t_atom *argv = *p_argv; ! int bytespersamp = 2, bigendian = 0, endianness = -1, swap, filetype = -1, normalize = 0; long onset = 0, nframes = 0x7fffffff; t_symbol *filesym; *************** *** 471,478 **** } ! static int create_soundfile(t_canvas *canvas, const char *filename, ! int filetype, int nframes, int bytespersamp, ! int bigendian, int nchannels, int swap, float samplerate) ! { char filenamebuf[MAXPDSTRING], buf2[MAXPDSTRING]; char headerbuf[WRITEHDRSIZE]; --- 465,470 ---- } ! static int create_soundfile(t_canvas *canvas, const char *filename, int filetype, int nframes, int bytespersamp, ! int bigendian, int nchannels, int swap, float samplerate) { char filenamebuf[MAXPDSTRING], buf2[MAXPDSTRING]; char headerbuf[WRITEHDRSIZE]; *************** *** 483,487 **** strncpy(filenamebuf, filename, MAXPDSTRING-10); filenamebuf[MAXPDSTRING-10] = 0; - if (filetype == FORMAT_NEXT) { if (strcasecmp(filenamebuf + strlen(filenamebuf)-4, ".snd")) strcat(filenamebuf, ".snd"); --- 475,478 ---- *************** *** 551,556 **** static void soundfile_finishwrite(void *obj, char *filename, int fd, ! int filetype, long nframes, long itemswritten, int bytesperframe, int swap) ! { if (itemswritten < nframes) { if (nframes < 0x7fffffff) --- 542,546 ---- static void soundfile_finishwrite(void *obj, char *filename, int fd, ! int filetype, long nframes, long itemswritten, int bytesperframe, int swap) { if (itemswritten < nframes) { if (nframes < 0x7fffffff) *************** *** 590,597 **** } ! static void soundfile_xferout(int nchannels, float **vecs, ! unsigned char *buf, int nitems, long onset, int bytespersamp, ! int bigendian, float normalfactor) ! { int i, j; unsigned char *sp, *sp2; --- 580,585 ---- } ! static void soundfile_xferout(int nchannels, float **vecs, unsigned char *buf, int nitems, long onset, int bytespersamp, ! int bigendian, float normalfactor) { int i, j; unsigned char *sp, *sp2; *************** *** 883,891 **** finalsize = vecsize[i]; } ! fd = open_soundfile(canvas_getdir(x->canvas)->s_name, filename, ! headersize, &bytespersamp, &bigendian, &channels, &bytelimit, skipframes); if (fd < 0) { ! pd_error(x, "soundfiler_read: %s: %s", filename, (errno == EIO ? ! "unknown or bad header format" : strerror(errno))); goto done; } --- 871,877 ---- finalsize = vecsize[i]; } ! fd = open_soundfile(canvas_getdir(x->canvas)->s_name, filename, headersize, &bytespersamp, &bigendian, &channels, &bytelimit, skipframes); if (fd < 0) { ! pd_error(x, "soundfiler_read: %s: %s", filename, (errno == EIO ? "unknown or bad header format" : strerror(errno))); goto done; } *************** *** 952,957 **** nitems = fread(sampbuf, channels * bytespersamp, thisread, fp); if (nitems <= 0) break; ! soundfile_xferin(channels, argc, nvecs, itemsread, ! (unsigned char *)sampbuf, nitems, bytespersamp, bigendian); itemsread += nitems; } --- 938,942 ---- nitems = fread(sampbuf, channels * bytespersamp, thisread, fp); if (nitems <= 0) break; ! soundfile_xferin(channels, argc, nvecs, itemsread, (unsigned char *)sampbuf, nitems, bytespersamp, bigendian); itemsread += nitems; } *************** *** 1052,1058 **** if (soundfiler_writeargparse(obj, &argc, &argv, &filesym, &filetype, ! &bytespersamp, &swap, &bigendian, &normalize, &onset, &nframes, ! &samplerate)) ! goto usage; nchannels = argc; if (nchannels < 1 || nchannels > MAXSFCHANS) goto usage; --- 1037,1042 ---- if (soundfiler_writeargparse(obj, &argc, &argv, &filesym, &filetype, ! &bytespersamp, &swap, &bigendian, &normalize, &onset, &nframes, &samplerate)) ! goto usage; nchannels = argc; if (nchannels < 1 || nchannels > MAXSFCHANS) goto usage; *************** *** 1078,1083 **** goto fail; } ! if ((fd = create_soundfile(canvas, filesym->s_name, filetype, ! nframes, bytespersamp, bigendian, nchannels, swap, samplerate)) < 0) { post("%s: %s\n", filesym->s_name, strerror(errno)); goto fail; --- 1062,1066 ---- goto fail; } ! if ((fd = create_soundfile(canvas, filesym->s_name, filetype, nframes, bytespersamp, bigendian, nchannels, swap, samplerate)) < 0) { post("%s: %s\n", filesym->s_name, strerror(errno)); goto fail; *************** *** 1095,1100 **** int thiswrite = nframes - itemswritten, nbytes; thiswrite = (thiswrite > bufframes ? bufframes : thiswrite); ! soundfile_xferout(argc, vecs, (unsigned char *)sampbuf, thiswrite, ! onset, bytespersamp, bigendian, normfactor); nbytes = write(fd, sampbuf, nchannels * bytespersamp * thiswrite); if (nbytes < nchannels * bytespersamp * thiswrite) { --- 1078,1082 ---- int thiswrite = nframes - itemswritten, nbytes; thiswrite = (thiswrite > bufframes ? bufframes : thiswrite); ! soundfile_xferout(argc, vecs, (unsigned char *)sampbuf, thiswrite, onset, bytespersamp, bigendian, normfactor); nbytes = write(fd, sampbuf, nchannels * bytespersamp * thiswrite); if (nbytes < nchannels * bytespersamp * thiswrite) { *************** *** 1107,1112 **** } if (fd >= 0) { ! soundfile_finishwrite(obj, filesym->s_name, fd, ! filetype, nframes, itemswritten, nchannels * bytespersamp, swap); close (fd); } --- 1089,1093 ---- } if (fd >= 0) { ! soundfile_finishwrite(obj, filesym->s_name, fd, filetype, nframes, itemswritten, nchannels * bytespersamp, swap); close (fd); } *************** *** 1284,1289 **** static void soundfiler_read(t_soundfiler *x, t_symbol *s, int argc, t_atom *argv) { int headersize = -1, channels = 0, bytespersamp = 0, bigendian = 0, resize = 0, i, j; ! long skipframes = 0, nframes = 0, finalsize = 0, maxsize = DEFMAXSIZE, itemsread = 0, ! bytelimit = 0x7fffffff; int fd = -1; char endianness, *filename; --- 1265,1269 ---- static void soundfiler_read(t_soundfiler *x, t_symbol *s, int argc, t_atom *argv) { int headersize = -1, channels = 0, bytespersamp = 0, bigendian = 0, resize = 0, i, j; ! long skipframes = 0, nframes = 0, finalsize = 0, maxsize = DEFMAXSIZE, itemsread = 0, bytelimit = 0x7fffffff; int fd = -1; char endianness, *filename; *************** *** 1383,1388 **** nitems = fread(sampbuf, channels * bytespersamp, thisread, fp); if (nitems <= 0) break; ! soundfile_xferin(channels, argc, vecs, itemsread, ! (unsigned char *)sampbuf, nitems, bytespersamp, bigendian); itemsread += nitems; } --- 1363,1367 ---- nitems = fread(sampbuf, channels * bytespersamp, thisread, fp); if (nitems <= 0) break; ! soundfile_xferin(channels, argc, vecs, itemsread, (unsigned char *)sampbuf, nitems, bytespersamp, bigendian); itemsread += nitems; } *************** *** 1454,1459 **** goto fail; } ! if ((fd = create_soundfile(canvas, filesym->s_name, filetype, ! nframes, bytespersamp, bigendian, nchannels, swap, samplerate)) < 0) { post("%s: %s\n", filesym->s_name, strerror(errno)); goto fail; --- 1433,1437 ---- goto fail; } ! if ((fd = create_soundfile(canvas, filesym->s_name, filetype, nframes, bytespersamp, bigendian, nchannels, swap, samplerate)) < 0) { post("%s: %s\n", filesym->s_name, strerror(errno)); goto fail; *************** *** 1470,1475 **** int thiswrite = nframes - itemswritten, nbytes; thiswrite = (thiswrite > bufframes ? bufframes : thiswrite); ! soundfile_xferout(argc, vecs, (unsigned char *)sampbuf, thiswrite, ! onset, bytespersamp, bigendian, normfactor); nbytes = write(fd, sampbuf, nchannels * bytespersamp * thiswrite); if (nbytes < nchannels * bytespersamp * thiswrite) { --- 1448,1452 ---- int thiswrite = nframes - itemswritten, nbytes; thiswrite = (thiswrite > bufframes ? bufframes : thiswrite); ! soundfile_xferout(argc, vecs, (unsigned char *)sampbuf, thiswrite, onset, bytespersamp, bigendian, normfactor); nbytes = write(fd, sampbuf, nchannels * bytespersamp * thiswrite); if (nbytes < nchannels * bytespersamp * thiswrite) { *************** *** 1482,1487 **** } if (fd >= 0) { ! soundfile_finishwrite(obj, filesym->s_name, fd, ! filetype, nframes, itemswritten, nchannels * bytespersamp, swap); close (fd); } --- 1459,1463 ---- } if (fd >= 0) { ! soundfile_finishwrite(obj, filesym->s_name, fd, filetype, nframes, itemswritten, nchannels * bytespersamp, swap); close (fd); } *************** *** 1638,1643 **** x->fileerror = 0; /* if there's already a file open, close it */ ! if (x->fd >= 0) ! { fd = x->fd; pthread_mutex_unlock(&x->mutex); --- 1614,1618 ---- x->fileerror = 0; /* if there's already a file open, close it */ ! if (x->fd >= 0) { fd = x->fd; pthread_mutex_unlock(&x->mutex); *************** *** 1645,1656 **** pthread_mutex_lock(&x->mutex); x->fd = -1; ! if (x->requestcode != REQUEST_BUSY) ! goto lost; } /* open the soundfile with the mutex unlocked */ pthread_mutex_unlock(&x->mutex); ! fd = open_soundfile(dirname, filename, ! skipheaderbytes, &bytespersample, &bigendian, ! &sfchannels, &bytelimit, onsetframes); pthread_mutex_lock(&x->mutex); --- 1620,1628 ---- pthread_mutex_lock(&x->mutex); x->fd = -1; ! if (x->requestcode != REQUEST_BUSY) goto lost; } /* open the soundfile with the mutex unlocked */ pthread_mutex_unlock(&x->mutex); ! fd = open_soundfile(dirname, filename, skipheaderbytes, &bytespersample, &bigendian, &sfchannels, &bytelimit, onsetframes); pthread_mutex_lock(&x->mutex); *************** *** 1796,1802 **** static t_int *readsf_perform(t_int *w) { t_readsf *x = (t_readsf *)(w[1]); ! int vecsize = x->vecsize, noutlets = x->noutlets, i, j, ! bytespersample = x->bytespersample, ! bigendian = x->bigendian; float *fp; if (x->state == STATE_STREAM) { --- 1768,1772 ---- static t_int *readsf_perform(t_int *w) { t_readsf *x = (t_readsf *)(w[1]); ! int vecsize = x->vecsize, noutlets = x->noutlets, i, j, bytespersample = x->bytespersample, bigendian = x->bigendian; float *fp; if (x->state == STATE_STREAM) { *************** *** 1824,1828 **** } /* then zero out the (rest of the) output */ ! for (i = 0; i < noutlets; i++) for (j = vecsize, fp = x->outvec[i] + xfersize; j--; ) *fp++ = 0; --- 1794,1798 ---- } /* then zero out the (rest of the) output */ ! for (int i=0; i<noutlets; i++) for (j = vecsize, fp = x->outvec[i] + xfersize; j--; ) *fp++ = 0; *************** *** 1831,1836 **** return w+2; } ! soundfile_xferin(sfchannels, noutlets, x->outvec, 0, ! (unsigned char *)(x->buf + x->fifotail), vecsize, bytespersample, bigendian); x->fifotail += wantbytes; if (x->fifotail >= x->fifosize) x->fifotail = 0; --- 1801,1805 ---- return w+2; } ! soundfile_xferin(sfchannels, noutlets, x->outvec, 0, (unsigned char *)(x->buf + x->fifotail), vecsize, bytespersample, bigendian); x->fifotail += wantbytes; if (x->fifotail >= x->fifosize) x->fifotail = 0; *************** *** 1939,1944 **** static void readsf_setup() { ! readsf_class = class_new(gensym("readsf~"), (t_newmethod)readsf_new, ! (t_method)readsf_free, sizeof(t_readsf), 0, A_DEFFLOAT, A_DEFFLOAT, 0); class_addfloat(readsf_class, (t_method)readsf_float); class_addmethod(readsf_class, (t_method)readsf_start, gensym("start"), 0); --- 1908,1912 ---- static void readsf_setup() { ! readsf_class = class_new(gensym("readsf~"), (t_newmethod)readsf_new, (t_method)readsf_free, sizeof(t_readsf), 0, A_DEFFLOAT, A_DEFFLOAT, 0); class_addfloat(readsf_class, (t_method)readsf_float); class_addmethod(readsf_class, (t_method)readsf_start, gensym("start"), 0); *************** *** 2022,2034 **** buffer */ if (x->fifohead < x->fifotail || x->fifohead >= x->fifotail + WRITESIZE ! || (x->requestcode == REQUEST_CLOSE && x->fifohead != x->fifotail)) ! { writebytes = (x->fifohead < x->fifotail ? fifosize : x->fifohead) - x->fifotail; ! if (writebytes > READSIZE) ! writebytes = READSIZE; } else { sfread_cond_signal(&x->answercondition); ! sfread_cond_wait(&x->requestcondition, ! &x->mutex); continue; } --- 1990,1999 ---- buffer */ if (x->fifohead < x->fifotail || x->fifohead >= x->fifotail + WRITESIZE ! || (x->requestcode == REQUEST_CLOSE && x->fifohead != x->fifotail)) { writebytes = (x->fifohead < x->fifotail ? fifosize : x->fifohead) - x->fifotail; ! if (writebytes > READSIZE) writebytes = READSIZE; } else { sfread_cond_signal(&x->answercondition); ! sfread_cond_wait(&x->requestcondition,&x->mutex); continue; } *************** *** 2107,2112 **** static t_int *writesf_perform(t_int *w) { t_writesf *x = (t_writesf *)(w[1]); ! int vecsize = x->vecsize, sfchannels = x->sfchannels, bytespersample = x->bytespersample, ! bigendian = x->bigendian; if (x->state == STATE_STREAM) { int wantbytes; --- 2072,2076 ---- static t_int *writesf_perform(t_int *w) { t_writesf *x = (t_writesf *)(w[1]); ! int vecsize = x->vecsize, sfchannels = x->sfchannels, bytespersample = x->bytespersample, bigendian = x->bigendian; if (x->state == STATE_STREAM) { int wantbytes; *************** *** 2123,2128 **** bigendian = x->bigendian; } ! soundfile_xferout(sfchannels, x->outvec, ! (unsigned char *)(x->buf + x->fifohead), vecsize, 0, bytespersample, bigendian, 1.); x->fifohead += wantbytes; if (x->fifohead >= x->fifosize) x->fifohead = 0; --- 2087,2091 ---- bigendian = x->bigendian; } ! soundfile_xferout(sfchannels, x->outvec, (unsigned char *)(x->buf + x->fifohead), vecsize, 0, bytespersample, bigendian, 1.); x->fifohead += wantbytes; if (x->fifohead >= x->fifosize) x->fifohead = 0;

1 0

pd/src d_ugen.c,1.3.4.1.2.5.2.11,1.3.4.1.2.5.2.12
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9908 Modified Files: Tag: desiredata d_ugen.c Log Message: cleanup Index: d_ugen.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ugen.c,v retrieving revision 1.3.4.1.2.5.2.11 retrieving revision 1.3.4.1.2.5.2.12 diff -C2 -d -r1.3.4.1.2.5.2.11 -r1.3.4.1.2.5.2.12 *** d_ugen.c 30 Jun 2007 13:56:06 -0000 1.3.4.1.2.5.2.11 --- d_ugen.c 10 Jul 2007 05:49:58 -0000 1.3.4.1.2.5.2.12 *************** *** 38,49 **** extern "C" { ! void vinlet_dspprolog(struct _vinlet *x, t_signal **parentsigs, ! int myvecsize, int calcsize, int phase, int period, int frequency, ! int downsample, int upsample, int reblock, int switched); ! void voutlet_dspprolog(struct _voutlet *x, t_signal **parentsigs, ! int myvecsize, int calcsize, int phase, int period, int frequency, int downsample, int upsample, int reblock, int switched); ! void voutlet_dspepilog(struct _voutlet *x, t_signal **parentsigs, ! int myvecsize, int calcsize, int phase, int period, int frequency, int downsample, int upsample, int reblock, int switched); }; --- 38,46 ---- extern "C" { ! void vinlet_dspprolog( struct _vinlet *x, t_signal **parentsigs, int myvecsize, int calcsize, int phase, int period, int frequency, int downsample, int upsample, int reblock, int switched); ! void voutlet_dspprolog(struct _voutlet *x, t_signal **parentsigs, int myvecsize, int calcsize, int phase, int period, int frequency, ! int downsample, int upsample, int reblock, int switched); ! void voutlet_dspepilog(struct _voutlet *x, t_signal **parentsigs, int myvecsize, int calcsize, int phase, int period, int frequency, int downsample, int upsample, int reblock, int switched); }; *************** *** 328,332 **** } ! /* mark the signal "reusable." */ extern "C" void signal_makereusable(t_signal *sig) { int logn = ilog2(sig->s_vecsize); --- 325,329 ---- } ! /* mark the signal "reusable." */ extern "C" void signal_makereusable(t_signal *sig) { int logn = ilog2(sig->s_vecsize); *************** *** 348,353 **** if (ugen_loud) post("free %lx: %d", sig, sig->s_isborrowed); if (sig->s_isborrowed) { ! /* if the signal is borrowed, decrement the borrowed-from signal's ! reference count, possibly marking it reusable too */ t_signal *s2 = sig->s_borrowedfrom; if ((s2 == sig) || !s2) bug("signal_free"); --- 345,349 ---- if (ugen_loud) post("free %lx: %d", sig, sig->s_isborrowed); if (sig->s_isborrowed) { ! /* if the signal is borrowed, decrement the borrowed-from signal's reference count, possibly marking it reusable too */ t_signal *s2 = sig->s_borrowedfrom; if ((s2 == sig) || !s2) bug("signal_free"); *************** *** 364,371 **** } ! /* reclaim or make an audio signal. If n is zero, return a "borrowed" ! signal whose buffer and size will be obtained later via ! signal_setborrowed(). */ ! t_signal *signal_new(int n, float sr) { int logn, vecsize = 0; --- 360,365 ---- } ! /* reclaim or make an audio signal. If n is zero, return a "borrowed" ! signal whose buffer and size will be obtained later via signal_setborrowed(). */ t_signal *signal_new(int n, float sr) { int logn, vecsize = 0; *************** *** 516,520 **** } ! /* first the canvas calls this to create all the boxes... */ extern "C" void ugen_add(t_dspcontext *dc, t_object *obj) { t_ugenbox *x = (t_ugenbox *)getbytes(sizeof *x); --- 510,514 ---- } ! /* first the canvas calls this to create all the boxes... */ extern "C" void ugen_add(t_dspcontext *dc, t_object *obj) { t_ugenbox *x = (t_ugenbox *)getbytes(sizeof *x); *************** *** 533,542 **** } ! /* and then this to make all the connections. */ extern "C" void ugen_connect(t_dspcontext *dc, t_object *x1, int outno, t_object *x2, int inno) { t_ugenbox *u1, *u2; - t_sigoutlet *uout; - t_siginlet *uin; - t_sigoutconnect *oc; int sigoutno = obj_sigoutletindex(x1, outno); int siginno = obj_siginletindex(x2, inno); --- 527,533 ---- } ! /* and then this to make all the connections. */ extern "C" void ugen_connect(t_dspcontext *dc, t_object *x1, int outno, t_object *x2, int inno) { t_ugenbox *u1, *u2; int sigoutno = obj_sigoutletindex(x1, outno); int siginno = obj_siginletindex(x2, inno); *************** *** 550,561 **** if (sigoutno < 0 || sigoutno >= u1->nout || siginno >= u2->nin) { bug("ugen_connect %s %s %d %d (%d %d)", ! class_getname(x1->ob_pd), ! class_getname(x2->ob_pd), sigoutno, siginno, u1->nout, ! u2->nin); } ! uout = u1->out + sigoutno; ! uin = u2->in + siginno; /* add a new connection to the outlet's list */ ! oc = (t_sigoutconnect *)getbytes(sizeof *oc); oc->next = uout->connections; uout->connections = oc; --- 541,550 ---- if (sigoutno < 0 || sigoutno >= u1->nout || siginno >= u2->nin) { bug("ugen_connect %s %s %d %d (%d %d)", ! class_getname(x1->ob_pd), class_getname(x2->ob_pd), sigoutno, siginno, u1->nout, u2->nin); } ! t_sigoutlet *uout = u1->out + sigoutno; ! t_siginlet * uin = u2->in + siginno; /* add a new connection to the outlet's list */ ! t_sigoutconnect *oc = (t_sigoutconnect *)getbytes(sizeof *oc); oc->next = uout->connections; uout->connections = oc; *************** *** 569,576 **** /* get the index of a ugenbox or -1 if it's not on the list */ static int ugen_index(t_dspcontext *dc, t_ugenbox *x) { ! int ret; ! t_ugenbox *u; ! for (u = dc->ugenlist, ret = 0; u; u = u->next, ret++) ! if (u == x) return ret; return -1; } --- 558,563 ---- /* get the index of a ugenbox or -1 if it's not on the list */ static int ugen_index(t_dspcontext *dc, t_ugenbox *x) { ! int ret=0; ! for (t_ugenbox *u = dc->ugenlist; u; u = u->next, ret++) if (u == x) return ret; return -1; } *************** *** 648,652 **** else if (u->nin+u->nout==1) post("put %s %d (%lx)", class_getname(u->obj->ob_pd), ugen_index(dc,u),sig[0]); else if (u->nin+u->nout==2) post("put %s %d (%lx %lx)", class_getname(u->obj->ob_pd), ugen_index(dc,u),sig[0],sig[1]); ! else post("put %s %d (%lx %lx %lx ...)", class_getname(u->obj->ob_pd), ugen_index(dc,u),sig[0],sig[1],sig[2]); } /* pass it on and trip anyone whose last inlet was filled */ --- 635,639 ---- else if (u->nin+u->nout==1) post("put %s %d (%lx)", class_getname(u->obj->ob_pd), ugen_index(dc,u),sig[0]); else if (u->nin+u->nout==2) post("put %s %d (%lx %lx)", class_getname(u->obj->ob_pd), ugen_index(dc,u),sig[0],sig[1]); ! else post("put %s %d (%lx %lx %lx ...)", class_getname(u->obj->ob_pd), ugen_index(dc,u),sig[0],sig[1],sig[2]); } /* pass it on and trip anyone whose last inlet was filled */ *************** *** 662,667 **** s2->s_refcount--; if (!signal_compatible(s1, s2)) { ! pd_error(u->obj, "%s: incompatible signal inputs", ! class_getname(u->obj->ob_pd)); return; } --- 649,653 ---- s2->s_refcount--; if (!signal_compatible(s1, s2)) { ! pd_error(u->obj, "%s: incompatible signal inputs", class_getname(u->obj->ob_pd)); return; } *************** *** 700,704 **** t_sigoutlet *uout; t_siginlet *uin; - t_sigoutconnect *oc, *oc2; int i, n; t_block *blk; --- 686,689 ---- *************** *** 708,714 **** int period, frequency, phase, vecsize, calcsize; float srate; - int chainblockbegin; /* DSP chain onset before block prolog code */ - int chainblockend; /* and after block epilog code */ - int chainafterall; /* and after signal outlet epilog */ int reblock = 0, switched; int downsample = 1, upsample = 1; /* IOhannes */ --- 693,696 ---- *************** *** 719,726 **** post("ugen: %s", class_getname(u->obj->ob_pd)); for (uout = u->out, i = 0; i < u->nout; uout++, i++) ! for (oc = uout->connections; oc; oc = oc->next) { ! post("... out %d to %s, index %d, inlet %d", i, ! class_getname(oc->who->obj->ob_pd), ! ugen_index(dc, oc->who), oc->inno); } } --- 701,706 ---- post("ugen: %s", class_getname(u->obj->ob_pd)); for (uout = u->out, i = 0; i < u->nout; uout++, i++) ! for (t_sigoutconnect *oc = uout->connections; oc; oc = oc->next) { ! post("... out %d to %s, index %d, inlet %d", i, class_getname(oc->who->obj->ob_pd), ugen_index(dc, oc->who), oc->inno); } } *************** *** 810,822 **** if (outsigs) outsigs += dc->ninlets; if (pd_class(zz) == vinlet_class) ! vinlet_dspprolog((struct _vinlet *)zz, ! dc->iosigs, vecsize, calcsize, dsp_phase, period, frequency, downsample, upsample, reblock, switched); else if (pd_class(zz) == voutlet_class) ! voutlet_dspprolog((struct _voutlet *)zz, ! outsigs, vecsize, calcsize, dsp_phase, period, frequency, downsample, upsample, reblock, switched); } ! chainblockbegin = dsp_chainsize; if (blk && (reblock || switched)) { /* add the block DSP prolog */ dsp_add(block_prolog, 1, blk); --- 790,800 ---- if (outsigs) outsigs += dc->ninlets; if (pd_class(zz) == vinlet_class) ! vinlet_dspprolog((struct _vinlet *)zz, dc->iosigs, vecsize, calcsize, dsp_phase, period, frequency, downsample, upsample, reblock, switched); else if (pd_class(zz) == voutlet_class) ! voutlet_dspprolog((struct _voutlet *)zz, outsigs, vecsize, calcsize, dsp_phase, period, frequency, downsample, upsample, reblock, switched); } ! int chainblockbegin = dsp_chainsize; /* DSP chain onset before block prolog code */ if (blk && (reblock || switched)) { /* add the block DSP prolog */ dsp_add(block_prolog, 1, blk); *************** *** 856,860 **** /* add block DSP epilog */ if (blk && (reblock || switched)) dsp_add(block_epilog, 1, blk); ! chainblockend = dsp_chainsize; /* add epilogs for outlets. */ for (u = dc->ugenlist; u; u = u->next) { --- 834,838 ---- /* add block DSP epilog */ if (blk && (reblock || switched)) dsp_add(block_epilog, 1, blk); ! int chainblockend = dsp_chainsize; /* and after block epilog code */ /* add epilogs for outlets. */ for (u = dc->ugenlist; u; u = u->next) { *************** *** 863,872 **** t_signal **iosigs = dc->iosigs; if (iosigs) iosigs += dc->ninlets; ! voutlet_dspepilog((struct _voutlet *)zz, ! iosigs, vecsize, calcsize, dsp_phase, period, frequency, downsample, upsample, reblock, switched); } } ! chainafterall = dsp_chainsize; if (blk) { blk->blocklength = chainblockend - chainblockbegin; --- 841,849 ---- t_signal **iosigs = dc->iosigs; if (iosigs) iosigs += dc->ninlets; ! voutlet_dspepilog((struct _voutlet *)zz, iosigs, vecsize, calcsize, dsp_phase, period, frequency, downsample, upsample, reblock, switched); } } ! int chainafterall = dsp_chainsize; /* and after signal outlet epilog */ if (blk) { blk->blocklength = chainblockend - chainblockbegin; *************** *** 883,887 **** while (dc->ugenlist) { for (uout = dc->ugenlist->out, n = dc->ugenlist->nout; n--; uout++) { ! oc = uout->connections; while (oc) { oc2 = oc->next; --- 860,864 ---- while (dc->ugenlist) { for (uout = dc->ugenlist->out, n = dc->ugenlist->nout; n--; uout++) { ! t_sigoutconnect *oc = uout->connections, *oc2; while (oc) { oc2 = oc->next; *************** *** 914,921 **** t_int *downsampling_perform_0(t_int *w) { ! t_float *in = (t_float *)(w[1]); /* original signal */ ! t_float *out = (t_float *)(w[2]); /* downsampled signal */ ! int down = (int)(w[3]); /* downsampling factor */ ! int parent = (int)(w[4]); /* original vectorsize */ int n=parent/down; while(n--) { --- 891,898 ---- t_int *downsampling_perform_0(t_int *w) { ! t_float *in = (t_float *)w[1]; /* original signal */ ! t_float *out = (t_float *)w[2]; /* downsampled signal */ ! int down = int(w[3]); /* downsampling factor */ ! int parent = int(w[4]); /* original vectorsize */ int n=parent/down; while(n--) { *************** *** 982,987 **** t_float *in = (t_float *)w[2]; /* original signal */ t_float *out = (t_float *)w[3]; /* upsampled signal */ ! const int up = int(w[4]); /* upsampling factor */ ! const int parent = int(w[5]); /* original vectorsize */ const int length = parent*up; int n; --- 959,964 ---- t_float *in = (t_float *)w[2]; /* original signal */ t_float *out = (t_float *)w[3]; /* upsampled signal */ ! const int up = int(w[4]); /* upsampling factor */ ! const int parent = int(w[5]); /* original vectorsize */ const int length = parent*up; int n; *************** *** 1009,1016 **** * cool for FFT-data, where you only want to process the significant (1st) part of the vector */ ! t_float *in = (t_float *)(w[1]); /* original signal */ ! t_float *out = (t_float *)(w[2]); /* upsampled signal */ ! int up = (int)(w[3]); /* upsampling factor */ ! int parent = (int)(w[4]); /* original vectorsize */ int i=parent; int n=parent*(up-1); --- 986,993 ---- * cool for FFT-data, where you only want to process the significant (1st) part of the vector */ ! t_float *in = (t_float *)w[1]; /* original signal */ ! t_float *out = (t_float *)w[2]; /* upsampled signal */ ! int up = (int)w[3]; /* upsampling factor */ ! int parent = (int)w[4]; /* original vectorsize */ int i=parent; int n=parent*(up-1); *************** *** 1039,1046 **** /* dsp-adding */ ! void resample_dsp(t_resample *x, ! t_sample* in, int insize, ! t_sample* out, int outsize, ! int method) { if (insize == outsize) { bug("nothing to be done"); --- 1016,1020 ---- /* dsp-adding */ ! void resample_dsp(t_resample *x, t_sample* in, int insize, t_sample* out, int outsize, int method) { if (insize == outsize) { bug("nothing to be done"); *************** *** 1053,1061 **** } switch (method) { ! case RESAMPLE_BLOCK: ! dsp_add(downsampling_perform_block, 4, in, out, insize/outsize, insize); ! break; ! default: ! dsp_add(downsampling_perform_0, 4, in, out, insize/outsize, insize); } } else { /* upsampling */ --- 1027,1032 ---- } switch (method) { ! case RESAMPLE_BLOCK: dsp_add(downsampling_perform_block, 4, in, out, insize/outsize, insize); break; ! default: dsp_add(downsampling_perform_0, 4, in, out, insize/outsize, insize); } } else { /* upsampling */ *************** *** 1065,1071 **** } switch (method) { ! case RESAMPLE_HOLD: ! dsp_add(upsampling_perform_hold, 4, in, out, outsize/insize, insize); ! break; case RESAMPLE_LINEAR: if (x->bufsize != 1) { --- 1036,1040 ---- } switch (method) { ! case RESAMPLE_HOLD: dsp_add(upsampling_perform_hold, 4, in, out, outsize/insize, insize); break; case RESAMPLE_LINEAR: if (x->bufsize != 1) { *************** *** 1076,1084 **** dsp_add(upsampling_perform_linear, 5, x, in, out, outsize/insize, insize); break; ! case RESAMPLE_BLOCK: ! dsp_add(upsampling_perform_block, 4, in, out, outsize/insize, insize); ! break; ! default: ! dsp_add(upsampling_perform_0, 4, in, out, outsize/insize, insize); } } --- 1045,1050 ---- dsp_add(upsampling_perform_linear, 5, x, in, out, outsize/insize, insize); break; ! case RESAMPLE_BLOCK: dsp_add(upsampling_perform_block, 4, in, out, outsize/insize, insize); break; ! default: dsp_add(upsampling_perform_0, 4, in, out, outsize/insize, insize); } } *************** *** 1105,1109 **** void resampleto_dsp(t_resample *x, t_sample *out, int insize, int outsize, int method) { if (insize==outsize) { ! if (x->s_n)free(x->s_vec); x->s_n = 0; x->s_vec = out; --- 1071,1075 ---- void resampleto_dsp(t_resample *x, t_sample *out, int insize, int outsize, int method) { if (insize==outsize) { ! if (x->s_n) free(x->s_vec); x->s_n = 0; x->s_vec = out; *************** *** 1149,1154 **** static void samplerate_tilde_setup() { ! samplerate_tilde_class = class_new(gensym("samplerate~"), ! (t_newmethod)samplerate_tilde_new, 0, sizeof(t_samplerate), 0, 0); class_addbang(samplerate_tilde_class, samplerate_tilde_bang); } --- 1115,1119 ---- static void samplerate_tilde_setup() { ! samplerate_tilde_class = class_new(gensym("samplerate~"), (t_newmethod)samplerate_tilde_new, 0, sizeof(t_samplerate), 0, 0); class_addbang(samplerate_tilde_class, samplerate_tilde_bang); }

1 0

pd/src s_audio_mmio.c,1.4.4.1.4.1,1.4.4.1.4.2
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9097 Modified Files: Tag: desiredata s_audio_mmio.c Log Message: cleanup Index: s_audio_mmio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_mmio.c,v retrieving revision 1.4.4.1.4.1 retrieving revision 1.4.4.1.4.2 diff -C2 -d -r1.4.4.1.4.1 -r1.4.4.1.4.2 *** s_audio_mmio.c 30 Jun 2007 20:28:14 -0000 1.4.4.1.4.1 --- s_audio_mmio.c 10 Jul 2007 05:47:28 -0000 1.4.4.1.4.2 *************** *** 9,23 **** #include "s_stuff.h" #include <stdio.h> - #include <windows.h> - #include <MMSYSTEM.H> /* ------------------------- audio -------------------------- */ ! static void nt_close_midiin(void); [...1223 lines suppressed...] } #endif ! void mmio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize) { int wRtn, ndev, i; *canmulti = 2; /* supports multiple devices */ ndev = waveInGetNumDevs(); ! if (ndev > maxndev) ndev = maxndev; *nindevs = ndev; ! for (i = 0; i < ndev; i++) { WAVEINCAPS wicap; wRtn = waveInGetDevCaps(i, (LPWAVEINCAPS) &wicap, sizeof(wicap)); sprintf(indevlist + i * devdescsize, (wRtn ? "???" : wicap.szPname)); } ndev = waveOutGetNumDevs(); ! if (ndev > maxndev) ndev = maxndev; *noutdevs = ndev; ! for (i = 0; i < ndev; i++) { WAVEOUTCAPS wocap; wRtn = waveOutGetDevCaps(i, (LPWAVEOUTCAPS) &wocap, sizeof(wocap));

1 0

pd/src s_audio_asio.cpp, 1.1.4.26.2.4.2.1, 1.1.4.26.2.4.2.2
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8743 Modified Files: Tag: desiredata s_audio_asio.cpp Log Message: cleanup Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.26.2.4.2.1 retrieving revision 1.1.4.26.2.4.2.2 diff -C2 -d -r1.1.4.26.2.4.2.1 -r1.1.4.26.2.4.2.2 *** s_audio_asio.cpp 30 Jun 2007 21:21:10 -0000 1.1.4.26.2.4.2.1 --- s_audio_asio.cpp 10 Jul 2007 05:47:03 -0000 1.1.4.26.2.4.2.2 *************** *** 51,62 **** /* public function prototypes */ ! // extern "C" void asio_open_audio(int naudioindev, int *audioindev, int nchindev, ! // int *chindev, int naudiooutdev, int *audiooutdev, ! // int nchoutdev, int *choutdev, int srate, int scheduler); ! extern "C" void asio_close_audio(void); ! extern "C" void asio_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int *canmulti, ! int maxndev, int devdescsize); ! extern "C" int asio_send_dacs(void); [...1842 lines suppressed...] sp += sys_dacblocksize; *************** *** 1342,1351 **** } } ! ! if(asio_useoutputready) ! ASIOOutputReady(); ! sys_unlock(); - return 0L; /* time info!!! */ } --- 1001,1006 ---- } } ! if(asio_useoutputready) ASIOOutputReady(); sys_unlock(); return 0L; /* time info!!! */ }

1 0

pd/src m_simd_sse_vc.c, 1.1.4.6.2.1, NONE m_simd_sse_vc.h, 1.1.4.9, NONE
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26957 Removed Files: Tag: desiredata m_simd_sse_vc.c m_simd_sse_vc.h Log Message: VC not supported in desiredata --- m_simd_sse_vc.h DELETED --- --- m_simd_sse_vc.c DELETED ---

1 0

pd/src s_audio_alsamm.c,1.1.4.5.2.2.2.2,1.1.4.5.2.2.2.3
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17965 Modified Files: Tag: desiredata s_audio_alsamm.c Log Message: cleanup Index: s_audio_alsamm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_alsamm.c,v retrieving revision 1.1.4.5.2.2.2.2 retrieving revision 1.1.4.5.2.2.2.3 diff -C2 -d -r1.1.4.5.2.2.2.2 -r1.1.4.5.2.2.2.3 *** s_audio_alsamm.c 20 Dec 2006 08:28:13 -0000 1.1.4.5.2.2.2.2 --- s_audio_alsamm.c 10 Jul 2007 04:45:58 -0000 1.1.4.5.2.2.2.3 *************** *** 3,14 **** * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ ! ! /* ! this audiodriverinterface inputs and outputs audio data using ! the ALSA MMAP API available on linux. this is optimized for hammerfall cards and does not make an attempt to be general now, please adapt to your needs or let me know ... constrains now: ! - audio Card with ALSA-Driver > 1.0.3, [...2040 lines suppressed...] ! ! void alsamm_showstat(snd_pcm_t *handle) ! { int err; snd_pcm_status_t *status; --- 869,882 ---- fpi += ichannels*sys_dacblocksize; } /* for out devno < alsamm_outcards*/ ! if ((timenow = sys_getrealtime()) > (timelast + sleep_time)) { ! if(debug && dac_send < 10 && sys_verbose) ! post("slept %f > %f + %f (=%f)", timenow,timelast,sleep_time,(timelast + sleep_time)); return (SENDDACS_SLEPT); ! } return SENDDACS_YES; } /* extra debug info */ ! void alsamm_showstat(snd_pcm_t *handle) { int err; snd_pcm_status_t *status;

1 0

pd/src poe.tcl,1.1.2.2.2.13,1.1.2.2.2.14
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29508 Modified Files: Tag: desiredata poe.tcl Log Message: group by class Index: poe.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/poe.tcl,v retrieving revision 1.1.2.2.2.13 retrieving revision 1.1.2.2.2.14 diff -C2 -d -r1.1.2.2.2.13 -r1.1.2.2.2.14 *** poe.tcl 30 Jun 2007 19:31:00 -0000 1.1.2.2.2.13 --- poe.tcl 10 Jul 2007 02:23:20 -0000 1.1.2.2.2.14 *************** *** 243,249 **** foreach o [array names _ *:_class] { set oo [lindex [split $o :] 0] ! puts " $oo $_($o)" incr n } puts "} ($n objects)" } --- 243,258 ---- foreach o [array names _ *:_class] { set oo [lindex [split $o :] 0] ! set class $_($o) ! incr by_class($class) ! puts " $oo is a $class" incr n } puts "} ($n objects)" + set n 0 + puts "poe.tcl class_stats: {" + foreach o [array names by_class] { + puts " class $o has $by_class($o) objects" + incr n + } + puts "} ($n classes)" }

1 0

pd/src s_audio.c,1.5.4.16.2.20.2.16,1.5.4.16.2.20.2.17
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28402 Modified Files: Tag: desiredata s_audio.c Log Message: cleanup Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.16 retrieving revision 1.5.4.16.2.20.2.17 diff -C2 -d -r1.5.4.16.2.20.2.16 -r1.5.4.16.2.20.2.17 *** s_audio.c 9 Jul 2007 22:04:03 -0000 1.5.4.16.2.20.2.16 --- s_audio.c 9 Jul 2007 22:27:11 -0000 1.5.4.16.2.20.2.17 *************** *** 34,38 **** extern t_audioapi pa_api, jack_api, oss_api, alsa_api, sgi_api, mmio_api, asio_api; ! static t_audioapi *sys_audio(void) { #ifdef USEAPI_PORTAUDIO if (sys_audioapi == API_PORTAUDIO) return &pa_api; --- 34,40 ---- extern t_audioapi pa_api, jack_api, oss_api, alsa_api, sgi_api, mmio_api, asio_api; ! using namespace std; ! ! static t_audioapi *sys_audio() { #ifdef USEAPI_PORTAUDIO if (sys_audioapi == API_PORTAUDIO) return &pa_api; *************** *** 108,112 **** static float (*peak_fp)(t_float*, t_int, t_float) = peakvec; ! static int audio_isopen(void) { return audio_state && ((audio_naudioindev > 0 && audio_audiochindev[0] > 0) --- 110,114 ---- static float (*peak_fp)(t_float*, t_int, t_float) = peakvec; ! static int audio_isopen() { return audio_state && ((audio_naudioindev > 0 && audio_audiochindev[0] > 0) *************** *** 135,140 **** audio_naudioindev = naudioindev; audio_naudiooutdev = naudiooutdev; ! for (int i=0; i<MAXAUDIOINDEV; i++) audio_audioindev[i] = audioindev[i], audio_audiochindev[i] = chindev[i]; ! for (int i=0; i<MAXAUDIOOUTDEV; i++) audio_audiooutdev[i] = audiooutdev[i], audio_audiochoutdev[i] = choutdev[i]; audio_rate = rate; audio_dacblocksize = dacblocksize; --- 137,142 ---- audio_naudioindev = naudioindev; audio_naudiooutdev = naudiooutdev; ! for (int i=0; i<MAXAUDIOINDEV; i++) {audio_audioindev[i] = audioindev[i]; audio_audiochindev[i] = chindev[i];} ! for (int i=0; i<MAXAUDIOOUTDEV; i++) {audio_audiooutdev[i] = audiooutdev[i]; audio_audiochoutdev[i] = choutdev[i];} audio_rate = rate; audio_dacblocksize = dacblocksize; *************** *** 146,156 **** any other API gets used. This is only true of OSS so far. */ #ifdef USEAPI_OSS ! void oss_init(void); #endif static void audio_init() { static int initted = 0; ! if (initted) ! return; initted = 1; #ifdef USEAPI_OSS --- 148,157 ---- any other API gets used. This is only true of OSS so far. */ #ifdef USEAPI_OSS ! void oss_init(); #endif static void audio_init() { static int initted = 0; ! if (initted) return; initted = 1; #ifdef USEAPI_OSS *************** *** 172,179 **** sys_outchannels = chout; sys_dacsr = double(sr); ! sys_advance_samples = int(sys_schedadvance*sys_dacsr/1000000.); ! if (sys_advance_samples < /* 3 * */sys_dacblocksize) ! sys_advance_samples = /* 3 * */sys_dacblocksize; ! if (sys_soundin) freealignedbytes(sys_soundin,inbytes); sys_soundin = (t_float *)getalignedbytes(inbytes); --- 173,177 ---- sys_outchannels = chout; sys_dacsr = double(sr); ! sys_advance_samples = max(int(sys_schedadvance*sys_dacsr/1000000.),sys_dacblocksize); if (sys_soundin) freealignedbytes(sys_soundin,inbytes); sys_soundin = (t_float *)getalignedbytes(inbytes); *************** *** 185,191 **** if (SIMD_CHKCNT(sys_inchannels * sys_dacblocksize) && SIMD_CHKCNT(sys_outchannels * sys_dacblocksize)) ! peak_fp = peakvec_simd; ! else ! peak_fp = peakvec; if (sys_verbose) post("input channels = %d, output channels = %d", sys_inchannels, sys_outchannels); canvas_resume_dsp(canvas_suspend_dsp()); --- 183,188 ---- if (SIMD_CHKCNT(sys_inchannels * sys_dacblocksize) && SIMD_CHKCNT(sys_outchannels * sys_dacblocksize)) ! peak_fp = peakvec_simd; ! else peak_fp = peakvec; if (sys_verbose) post("input channels = %d, output channels = %d", sys_inchannels, sys_outchannels); canvas_resume_dsp(canvas_suspend_dsp()); *************** *** 205,211 **** int *choutdev, int rate, int dacblocksize, int advance, int schedmode, int enable) { - int i; int defaultchannels = SYS_DEFAULTCH; - int inchans, outchans; int realinchans[MAXAUDIOINDEV], realoutchans[MAXAUDIOOUTDEV]; --- 202,206 ---- *************** *** 237,241 **** } else naudioindev = nchindev = 0; } else { ! for (i = 0; i < MAXAUDIOINDEV; i++) audioindev[i] = i; naudioindev = nchindev; } --- 232,236 ---- } else naudioindev = nchindev = 0; } else { ! for (int i=0; i<MAXAUDIOINDEV; i++) audioindev[i] = i; naudioindev = nchindev; } *************** *** 243,255 **** if (nchindev == -1) { nchindev = naudioindev; ! for (i = 0; i < naudioindev; i++) ! chindev[i] = defaultchannels; } else if (nchindev > naudioindev) { ! for (i = naudioindev; i < nchindev; i++) { if (i == 0) audioindev[0] = DEFAULTAUDIODEV; else audioindev[i] = audioindev[i-1] + 1; } naudioindev = nchindev; } else if (nchindev < naudioindev) { ! for (i = nchindev; i < naudioindev; i++) { if (i == 0) chindev[0] = defaultchannels; else chindev[i] = chindev[i-1]; } --- 238,249 ---- if (nchindev == -1) { nchindev = naudioindev; ! for (int i=0; i<naudioindev; i++) chindev[i] = defaultchannels; } else if (nchindev > naudioindev) { ! for (int i=naudioindev; i<nchindev; i++) { if (i == 0) audioindev[0] = DEFAULTAUDIODEV; else audioindev[i] = audioindev[i-1] + 1; } naudioindev = nchindev; } else if (nchindev < naudioindev) { ! for (int i=nchindev; i<naudioindev; i++) { if (i == 0) chindev[0] = defaultchannels; else chindev[i] = chindev[i-1]; } *************** *** 266,270 **** } else nchoutdev = naudiooutdev = 0; } else { ! for (i = 0; i < MAXAUDIOOUTDEV; i++) audiooutdev[i] = i; naudiooutdev = nchoutdev; } --- 260,264 ---- } else nchoutdev = naudiooutdev = 0; } else { ! for (int i=0; i<MAXAUDIOOUTDEV; i++) audiooutdev[i] = i; naudiooutdev = nchoutdev; } *************** *** 272,283 **** if (nchoutdev == -1) { nchoutdev = naudiooutdev; ! for (i = 0; i < naudiooutdev; i++) choutdev[i] = defaultchannels; } else if (nchoutdev > naudiooutdev) { ! for (i = naudiooutdev; i < nchoutdev; i++) { if (i == 0) audiooutdev[0] = DEFAULTAUDIODEV; else audiooutdev[i] = audiooutdev[i-1] + 1; } naudiooutdev = nchoutdev; } else if (nchoutdev < naudiooutdev) { ! for (i = nchoutdev; i < naudiooutdev; i++) { if (i == 0) choutdev[0] = defaultchannels; else choutdev[i] = choutdev[i-1]; } --- 266,277 ---- if (nchoutdev == -1) { nchoutdev = naudiooutdev; ! for (int i=0; i<naudiooutdev; i++) choutdev[i] = defaultchannels; } else if (nchoutdev > naudiooutdev) { ! for (int i=naudiooutdev; i<nchoutdev; i++) { if (i == 0) audiooutdev[0] = DEFAULTAUDIODEV; else audiooutdev[i] = audiooutdev[i-1] + 1; } naudiooutdev = nchoutdev; } else if (nchoutdev < naudiooutdev) { ! for (int i=nchoutdev; i<naudiooutdev; i++) { if (i == 0) choutdev[0] = defaultchannels; else choutdev[i] = choutdev[i-1]; } *************** *** 286,297 **** } /* count total number of input and output channels */ ! for (i = inchans = 0; i < naudioindev; i++) ! inchans += (realinchans[i] = (chindev[i] > 0 ? chindev[i] : 0)); ! for (i = outchans = 0; i < naudiooutdev; i++) ! outchans += (realoutchans[i] = (choutdev[i] > 0 ? choutdev[i] : 0)); ! /* if no input or output devices seem to have been specified, ! this really means just disable audio, which we now do. */ ! if (!inchans && !outchans) ! enable = 0; sys_schedadvance = advance * 1000; --- 280,288 ---- } /* count total number of input and output channels */ ! int inchans=0, outchans=0; ! for (int i=0; i < naudioindev; i++) inchans += (realinchans[i] = (chindev[i] > 0 ? chindev[i] : 0)); ! for (int i=0; i < naudiooutdev; i++) outchans += (realoutchans[i] = (choutdev[i] > 0 ? choutdev[i] : 0)); ! /* if no input or output devices seem to have been specified, this really means just disable audio, which we now do. */ ! if (!inchans && !outchans) enable = 0; sys_schedadvance = advance * 1000; *************** *** 341,346 **** } ! extern void sgi_close_audio(void); ! void sys_close_audio(void) { /* jsarlo { (*/ if (sys_externalschedlib) return; --- 332,336 ---- } ! void sys_close_audio() { /* jsarlo { (*/ if (sys_externalschedlib) return; *************** *** 354,358 **** /* open audio using whatever parameters were last used */ ! void sys_reopen_audio( void) { int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; --- 344,348 ---- /* open audio using whatever parameters were last used */ ! void sys_reopen_audio() { int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; *************** *** 367,372 **** /* tb: default value of peak_fp {*/ float peakvec(t_float* vec, t_int n, t_float cur_max) { ! int i; ! for (i = 0; i != n; ++i) { float f = *vec++; if (f > cur_max) cur_max = f; --- 357,361 ---- /* tb: default value of peak_fp {*/ float peakvec(t_float* vec, t_int n, t_float cur_max) { ! for (int i=0; i<n; i++) { float f = *vec++; if (f > cur_max) cur_max = f; *************** *** 377,387 **** /* } */ ! void sys_peakmeters(void) { if (sys_inchannels) sys_inmax = peak_fp(sys_soundin, sys_inchannels * sys_dacblocksize, sys_inmax); if (sys_outchannels) sys_outmax = peak_fp(sys_soundout,sys_outchannels * sys_dacblocksize, sys_outmax); } ! extern int sgi_send_dacs(void); ! int sys_send_dacs(void) { if (sys_meters) sys_peakmeters(); if (sys_audio()) return sys_audio()->send_dacs(); --- 366,375 ---- /* } */ ! void sys_peakmeters() { if (sys_inchannels) sys_inmax = peak_fp(sys_soundin, sys_inchannels * sys_dacblocksize, sys_inmax); if (sys_outchannels) sys_outmax = peak_fp(sys_soundout,sys_outchannels * sys_dacblocksize, sys_outmax); } ! int sys_send_dacs() { if (sys_meters) sys_peakmeters(); if (sys_audio()) return sys_audio()->send_dacs(); *************** *** 390,396 **** } ! float sys_getsr(void) {return sys_dacsr;} ! int sys_get_outchannels(void) {return sys_outchannels;} ! int sys_get_inchannels(void) {return sys_inchannels;} void sys_getmeters(float *inmax, float *outmax) { --- 378,384 ---- } ! float sys_getsr() {return sys_dacsr;} ! int sys_get_outchannels() {return sys_outchannels;} ! int sys_get_inchannels() {return sys_inchannels;} void sys_getmeters(float *inmax, float *outmax) { *************** *** 403,410 **** } ! void sys_reportidle(void) {} - extern void sgi_getdevs(char *indevlist, int *nindevs, - char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); static void audio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize) { --- 391,396 ---- } ! void sys_reportidle() {} static void audio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize) { *************** *** 413,419 **** else { /* this shouldn't happen once all the above get filled in. */ - int i; *nindevs = *noutdevs = 3; ! for (i = 0; i < 3; i++) { sprintf(indevlist + i * devdescsize, "input device #%d", i+1); sprintf(outdevlist + i * devdescsize, "output device #%d", i+1); --- 399,404 ---- else { /* this shouldn't happen once all the above get filled in. */ *nindevs = *noutdevs = 3; ! for (int i=0; i<3; i++) { sprintf(indevlist + i * devdescsize, "input device #%d", i+1); sprintf(outdevlist + i * devdescsize, "output device #%d", i+1); *************** *** 423,444 **** } ! static void sys_listaudiodevs(void) { char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; int nindevs = 0, noutdevs = 0, i, canmulti = 0; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! /* To agree with command line flags, normally start at 1 */ ! /* But microsoft "MMIO" device list starts at 0 (the "mapper"). */ /* (see also sys_mmio variable in s_main.c) */ if (!nindevs) post("no audio input devices found"); else { post("audio input devices:"); ! for (i = 0; i < nindevs; i++) ! post("%d. %s", i + (sys_audioapi != API_MMIO), indevlist + i * DEVDESCSIZE); } if (!noutdevs) post("no audio output devices found"); else { post("audio output devices:"); ! for (i = 0; i < noutdevs; i++) ! post("%d. %s", i + (sys_audioapi != API_MMIO), outdevlist + i * DEVDESCSIZE); } post("API number %d\n", sys_audioapi); --- 408,426 ---- } ! static void sys_listaudiodevs() { char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; int nindevs = 0, noutdevs = 0, i, canmulti = 0; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! /* To agree with command line flags, normally start at 1; but microsoft "MMIO" device list starts at 0 (the "mapper"). */ /* (see also sys_mmio variable in s_main.c) */ if (!nindevs) post("no audio input devices found"); else { post("audio input devices:"); ! for (i = 0; i < nindevs; i++) post("%d. %s", i + (sys_audioapi != API_MMIO), indevlist + i * DEVDESCSIZE); } if (!noutdevs) post("no audio output devices found"); else { post("audio output devices:"); ! for (i = 0; i < noutdevs; i++) post("%d. %s", i + (sys_audioapi != API_MMIO), outdevlist + i * DEVDESCSIZE); } post("API number %d\n", sys_audioapi); *************** *** 450,509 **** int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; - int audioindev1, audioindev2, audioindev3, audioindev4, - audioinchan1, audioinchan2, audioinchan3, audioinchan4, - audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, - audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4; int rate, dacblocksize, advance, scheduler; /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; int nindevs = 0, noutdevs = 0, canmulti = 0; - std::ostringstream indevliststring; - std::ostringstream outdevliststring; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! indevliststring << "{"; ! for (int i=0; i<nindevs; i++) indevliststring << "{" << (indevlist + i*DEVDESCSIZE) << "} "; ! indevliststring << "}"; ! outdevliststring << "{"; ! for (int i=0; i<noutdevs; i++) outdevliststring << "{" << (outdevlist + i*DEVDESCSIZE) << "} "; ! outdevliststring << "}"; ! sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); if (naudioindev > 1 || naudiooutdev > 1) flongform = 1; ! std::ostringstream audioindevs; for (int i=0; i<naudioindev; i++) audioindevs << audioindev [i] << " "; ! std::ostringstream audiooutdevs; for (int i=0; i<naudiooutdev; i++) audiooutdevs << audiooutdev[i] << " "; ! std::ostringstream audioinchans; for (int i=0; i<naudioindev; i++) audioinchans << chindev [i] << " "; ! std::ostringstream audiooutchans; for (int i=0; i<naudiooutdev; i++) audiooutchans << choutdev [i] << " "; ! ! sys_vgui("pdtk_audio_dialog %s {%s} {%s} %s {%s} {%s} %d %d %d %d %d\n", ! indevliststring.str().data(), audioindevs.str().data(), audioinchans.str().data(), ! outdevliststring.str().data(), audiooutdevs.str().data(), audiooutchans.str().data(), rate, dacblocksize, advance, canmulti, flongform!=0); } ! /* new values from dialog window */ void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv) { ! int i, nindev, noutdev; int newaudioindev[4], newaudioinchan[4], newaudiooutdev[4], newaudiooutchan[4]; /* the new values the dialog came back with: */ ! int newrate = atom_getintarg(16, argc, argv); int newdacblocksize = atom_getintarg(17, argc, argv); ! int newadvance = atom_getintarg(18, argc, argv); ! int newschedmode = atom_getintarg(19, argc, argv); ! for (i = 0; i < 4; i++) { ! newaudioindev[i] = atom_getintarg(i, argc, argv); ! newaudioinchan[i] = atom_getintarg(i+4, argc, argv); ! newaudiooutdev[i] = atom_getintarg(i+8, argc, argv); newaudiooutchan[i] = atom_getintarg(i+12, argc, argv); } ! for (i = 0, nindev = 0; i < 4; i++) { if (newaudioinchan[i]) { ! newaudioindev[nindev] = newaudioindev[i]; newaudioinchan[nindev] = newaudioinchan[i]; nindev++; } } ! for (i = 0, noutdev = 0; i < 4; i++) { if (newaudiooutchan[i]) { ! newaudiooutdev[noutdev] = newaudiooutdev[i]; newaudiooutchan[noutdev] = newaudiooutchan[i]; noutdev++; --- 432,479 ---- int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; int rate, dacblocksize, advance, scheduler; /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; int nindevs = 0, noutdevs = 0, canmulti = 0; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! ostringstream indevliststring; for (int i=0; i<nindevs; i++) indevliststring << " {" << (indevlist + i*DEVDESCSIZE) << "}"; ! ostringstream outdevliststring; for (int i=0; i<noutdevs; i++) outdevliststring << " {" << (outdevlist + i*DEVDESCSIZE) << "}"; ! sys_get_audio_params(&naudioindev,audioindev,chindev,&naudiooutdev,audiooutdev,choutdev,&rate,&dacblocksize,&advance,&scheduler); if (naudioindev > 1 || naudiooutdev > 1) flongform = 1; ! ostringstream audioindevs; for (int i=0; i<naudioindev; i++) audioindevs << " " << audioindev [i]; ! ostringstream audiooutdevs; for (int i=0; i<naudiooutdev; i++) audiooutdevs << " " << audiooutdev[i]; ! ostringstream audioinchans; for (int i=0; i<naudioindev; i++) audioinchans << " " << chindev [i]; ! ostringstream audiooutchans; for (int i=0; i<naudiooutdev; i++) audiooutchans << " " << choutdev [i]; ! sys_vgui("pdtk_audio_dialog {%s} {%s} {%s} {%s} {%s} {%s} %d %d %d %d %d\n", ! indevliststring .str().data()+1, audioindevs.str().data()+1, audioinchans.str().data()+1, ! outdevliststring.str().data()+1, audiooutdevs.str().data()+1, audiooutchans.str().data()+1, rate, dacblocksize, advance, canmulti, flongform!=0); } ! /* new values from dialog window */ void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv) { ! int nindev=0, noutdev=0; int newaudioindev[4], newaudioinchan[4], newaudiooutdev[4], newaudiooutchan[4]; /* the new values the dialog came back with: */ ! int newrate = atom_getintarg(16, argc, argv); int newdacblocksize = atom_getintarg(17, argc, argv); ! int newadvance = atom_getintarg(18, argc, argv); ! int newschedmode = atom_getintarg(19, argc, argv); ! for (int i=0; i<4; i++) { ! newaudioindev[i] = atom_getintarg(i, argc, argv); ! newaudioinchan[i] = atom_getintarg(i+4, argc, argv); ! newaudiooutdev[i] = atom_getintarg(i+8, argc, argv); newaudiooutchan[i] = atom_getintarg(i+12, argc, argv); } ! for (int i=0; i<4; i++) { if (newaudioinchan[i]) { ! newaudioindev[nindev] = newaudioindev[i]; newaudioinchan[nindev] = newaudioinchan[i]; nindev++; } } ! for (int i=0; i<4; i++) { if (newaudiooutchan[i]) { ! newaudiooutdev[noutdev] = newaudiooutdev[i]; newaudiooutchan[noutdev] = newaudiooutchan[i]; noutdev++; *************** *** 511,521 **** } sys_close_audio(); ! sys_open_audio(nindev, newaudioindev, nindev, newaudioinchan, ! noutdev, newaudiooutdev, noutdev, newaudiooutchan, ! newrate, newdacblocksize, newadvance, newschedmode, 1); } ! extern void sgi_listaudiodevs(void); ! void sys_listdevs(void) { if (sys_audioapi == API_PORTAUDIO) sys_listaudiodevs(); else #ifdef USEAPI_JACK --- 481,491 ---- } sys_close_audio(); ! sys_open_audio(nindev, newaudioindev, nindev, newaudioinchan, ! noutdev, newaudiooutdev, noutdev, newaudiooutchan, ! newrate, newdacblocksize, newadvance, newschedmode, 1); } ! extern void sgi_listaudiodevs(); ! void sys_listdevs() { if (sys_audioapi == API_PORTAUDIO) sys_listaudiodevs(); else #ifdef USEAPI_JACK *************** *** 606,610 **** void alsa_putzeros(int iodev, int n); void alsa_getzeros(int iodev, int n); ! void alsa_printstate(void); #endif --- 576,580 ---- void alsa_putzeros(int iodev, int n); void alsa_getzeros(int iodev, int n); ! void alsa_printstate(); #endif *************** *** 635,639 **** } ! void glob_audio_api(t_pd * dummy, t_float f) { int newapi = (int)f; sys_close_audio(); --- 605,609 ---- } ! void glob_audio_api(t_pd *dummy, t_float f) { int newapi = (int)f; sys_close_audio(); *************** *** 641,645 **** } ! void glob_audio_delay(t_pd * dummy, t_float f) { int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; --- 611,615 ---- } ! void glob_audio_delay(t_pd *dummy, t_float f) { int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; *************** *** 685,696 **** } ! void glob_audio_device(t_pd * dummy, t_symbol *s, int argc, t_atom *argv) { int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance, scheduler, i; sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); naudiooutdev = naudioindev = (int)atom_getfloatarg(0, argc, argv); ! for (i = 0; i != MAXAUDIOINDEV; i++) { audiooutdev [i] = audioindev [i] = int(atom_getfloatarg(i*2+1, argc, argv)); audiochoutdev[i] = audiochindev[i] = int(atom_getfloatarg(i*2+2, argc, argv)); --- 655,666 ---- } ! void glob_audio_device(t_pd *dummy, t_symbol *s, int argc, t_atom *argv) { int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance, scheduler; sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); naudiooutdev = naudioindev = (int)atom_getfloatarg(0, argc, argv); ! for (int i=0; i<MAXAUDIOINDEV; i++) { audiooutdev [i] = audioindev [i] = int(atom_getfloatarg(i*2+1, argc, argv)); audiochoutdev[i] = audiochindev[i] = int(atom_getfloatarg(i*2+2, argc, argv)); *************** *** 701,712 **** } ! void glob_audio_device_in(t_pd * dummy, t_symbol *s, int argc, t_atom *argv) { int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance, scheduler, i; sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); naudioindev = (int)atom_getfloatarg(0, argc, argv); ! for (i = 0; i != MAXAUDIOINDEV; i=i+2) { audioindev [i] = atom_getintarg(i+1, argc, argv); audiochindev[i] = atom_getintarg(i+2, argc, argv); --- 671,682 ---- } ! void glob_audio_device_in(t_pd *dummy, t_symbol *s, int argc, t_atom *argv) { int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance, scheduler; sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); naudioindev = (int)atom_getfloatarg(0, argc, argv); ! for (int i=0; i<MAXAUDIOINDEV; i=i+2) { audioindev [i] = atom_getintarg(i+1, argc, argv); audiochindev[i] = atom_getintarg(i+2, argc, argv); *************** *** 720,728 **** int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance, scheduler, i; sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); naudiooutdev = (int)atom_getfloatarg(0, argc, argv); ! for (i = 0; i != MAXAUDIOOUTDEV; i=i+2) { audiooutdev [i] = atom_getintarg(i+1, argc, argv); audiochoutdev[i] = atom_getintarg(i+2, argc, argv); --- 690,699 ---- int naudioindev, audioindev[MAXAUDIOINDEV], audiochindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], audiochoutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance, scheduler; sys_get_audio_params(&naudioindev, audioindev, audiochindev, &naudiooutdev, audiooutdev, audiochoutdev, &rate, &dacblocksize, &advance, &scheduler); naudiooutdev = (int)atom_getfloatarg(0, argc, argv); ! /* i+=2 ? isn't that a bug??? */ ! for (int i=0; i<MAXAUDIOOUTDEV; i+=2) { audiooutdev [i] = atom_getintarg(i+1, argc, argv); audiochoutdev[i] = atom_getintarg(i+2, argc, argv); *************** *** 734,738 **** /* some general helper functions */ ! void sys_update_sleepgrain(void) { sys_sleepgrain = sys_schedadvance/4; if (sys_sleepgrain < 1000) sys_sleepgrain = 1000; --- 705,709 ---- /* some general helper functions */ ! void sys_update_sleepgrain() { sys_sleepgrain = sys_schedadvance/4; if (sys_sleepgrain < 1000) sys_sleepgrain = 1000; *************** *** 750,761 **** t_atom argv[MAXNDEV]; int f = ac ? (int)atom_getfloatarg(0,ac,av) : -1; ! t_symbol * selector = gensym("audioindev"); ! t_symbol * pd = gensym("pd"); audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); if (f < 0) { ! int i; ! for (i = 0; i != nindevs ;++i) SETSTRING(argv+i,indevlist + i * DEVDESCSIZE); typedmess(pd->s_thing, selector, nindevs, argv); } else if (f < nindevs) { --- 721,731 ---- t_atom argv[MAXNDEV]; int f = ac ? (int)atom_getfloatarg(0,ac,av) : -1; ! t_symbol *selector = gensym("audioindev"); ! t_symbol *pd = gensym("pd"); audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); if (f < 0) { ! for (int i=0; i<nindevs ;++i) SETSTRING(argv+i,indevlist + i * DEVDESCSIZE); typedmess(pd->s_thing, selector, nindevs, argv); } else if (f < nindevs) { *************** *** 791,795 **** /* some prototypes from s_audio_portaudio.c */ ! extern void pa_getcurrent_devices(void); extern void pa_getaudioininfo(t_float f); extern void pa_getaudiooutinfo(t_float f); --- 761,765 ---- /* some prototypes from s_audio_portaudio.c */ ! extern void pa_getcurrent_devices(); extern void pa_getaudioininfo(t_float f); extern void pa_getaudiooutinfo(t_float f); *************** *** 812,816 **** #endif } ! void glob_audio_getcurrent_devices(void) { #if defined(USEAPI_PORTAUDIO) && !defined(PABLIO) if (sys_audioapi == API_PORTAUDIO) pa_getcurrent_devices(); --- 782,786 ---- #endif } ! void glob_audio_getcurrent_devices() { #if defined(USEAPI_PORTAUDIO) && !defined(PABLIO) if (sys_audioapi == API_PORTAUDIO) pa_getcurrent_devices(); *************** *** 824,826 **** /* tb } */ - --- 794,795 ----

1 0

pd/src s_audio.c,1.5.4.16.2.20.2.15,1.5.4.16.2.20.2.16
by Mathieu Bouchard 10 Jul '07

10 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18458 Modified Files: Tag: desiredata s_audio.c Log Message: variable length device lists Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.15 retrieving revision 1.5.4.16.2.20.2.16 diff -C2 -d -r1.5.4.16.2.20.2.15 -r1.5.4.16.2.20.2.16 *** s_audio.c 9 Jul 2007 21:07:37 -0000 1.5.4.16.2.20.2.15 --- s_audio.c 9 Jul 2007 22:04:03 -0000 1.5.4.16.2.20.2.16 *************** *** 469,494 **** sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); - /* post("naudioindev %d naudiooutdev %d longform %f", - naudioindev, naudiooutdev, flongform); */ if (naudioindev > 1 || naudiooutdev > 1) flongform = 1; ! audioindev1 = (naudioindev > 0 && audioindev[0]>= 0 ? audioindev[0] : 0); ! audioindev2 = (naudioindev > 1 && audioindev[1]>= 0 ? audioindev[1] : 0); ! audioindev3 = (naudioindev > 2 && audioindev[2]>= 0 ? audioindev[2] : 0); ! audioindev4 = (naudioindev > 3 && audioindev[3]>= 0 ? audioindev[3] : 0); ! audioinchan1 = (naudioindev > 0 ? chindev[0] : 0); ! audioinchan2 = (naudioindev > 1 ? chindev[1] : 0); ! audioinchan3 = (naudioindev > 2 ? chindev[2] : 0); ! audioinchan4 = (naudioindev > 3 ? chindev[3] : 0); ! audiooutdev1 = (naudiooutdev > 0 && audiooutdev[0]>=0 ? audiooutdev[0] : 0); ! audiooutdev2 = (naudiooutdev > 1 && audiooutdev[1]>=0 ? audiooutdev[1] : 0); ! audiooutdev3 = (naudiooutdev > 2 && audiooutdev[2]>=0 ? audiooutdev[2] : 0); ! audiooutdev4 = (naudiooutdev > 3 && audiooutdev[3]>=0 ? audiooutdev[3] : 0); ! audiooutchan1 = (naudiooutdev > 0 ? choutdev[0] : 0); ! audiooutchan2 = (naudiooutdev > 1 ? choutdev[1] : 0); ! audiooutchan3 = (naudiooutdev > 2 ? choutdev[2] : 0); ! audiooutchan4 = (naudiooutdev > 3 ? choutdev[3] : 0); ! sys_vgui("pdtk_audio_dialog %s {%d %d %d %d} {%d %d %d %d} %s {%d %d %d %d} {%d %d %d %d} %d %d %d %d %d\n", ! indevliststring.str().data(), audioindev1, audioindev2, audioindev3, audioindev4, audioinchan1, audioinchan2, audioinchan3, audioinchan4, ! outdevliststring.str().data(), audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, rate, dacblocksize, advance, canmulti, flongform!=0); } --- 469,481 ---- sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); if (naudioindev > 1 || naudiooutdev > 1) flongform = 1; ! std::ostringstream audioindevs; for (int i=0; i<naudioindev; i++) audioindevs << audioindev [i] << " "; ! std::ostringstream audiooutdevs; for (int i=0; i<naudiooutdev; i++) audiooutdevs << audiooutdev[i] << " "; ! std::ostringstream audioinchans; for (int i=0; i<naudioindev; i++) audioinchans << chindev [i] << " "; ! std::ostringstream audiooutchans; for (int i=0; i<naudiooutdev; i++) audiooutchans << choutdev [i] << " "; ! ! sys_vgui("pdtk_audio_dialog %s {%s} {%s} %s {%s} {%s} %d %d %d %d %d\n", ! indevliststring.str().data(), audioindevs.str().data(), audioinchans.str().data(), ! outdevliststring.str().data(), audiooutdevs.str().data(), audiooutchans.str().data(), rate, dacblocksize, advance, canmulti, flongform!=0); }

1 0

externals/hcs stat.c,1.4,1.4.2.1
by Hans-Christoph Steiner 09 Jul '07

09 Jul '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3226 Modified Files: Tag: branch-v0-39-2-extended stat.c Log Message: minor code cleanup in prep for debugging 1750770, but then the bug went away... hmm... maybe the bug is related to the auto-build... Index: stat.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/stat.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** stat.c 14 Jun 2006 23:38:05 -0000 1.4 --- stat.c 9 Jul 2007 21:28:30 -0000 1.4.2.1 *************** *** 178,191 **** { DEBUG(post("stat_output");); - #ifdef _WIN32 - struct _stat stat_buffer; - #else - struct stat stat_buffer; - #endif int result; - #ifdef _WIN32 result = _stat(x->x_filename->s_name, &stat_buffer); #else result = stat(x->x_filename->s_name, &stat_buffer); #endif /* _WIN32 */ --- 178,187 ---- { DEBUG(post("stat_output");); int result; #ifdef _WIN32 + struct _stat stat_buffer; result = _stat(x->x_filename->s_name, &stat_buffer); #else + struct stat stat_buffer; result = stat(x->x_filename->s_name, &stat_buffer); #endif /* _WIN32 */

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
63
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs July 2007