Pd-cvs July 2007

pd-cvs@lists.iem.at

20 participants
623 discussions

pd/src kernel.c, 1.1.2.74, 1.1.2.75 m_pd.h, 1.4.4.11.2.33.2.65, 1.4.4.11.2.33.2.66
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23789 Modified Files: Tag: desiredata kernel.c m_pd.h Log Message: inlined all methods of t_hash Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.65 retrieving revision 1.4.4.11.2.33.2.66 diff -C2 -d -r1.4.4.11.2.33.2.65 -r1.4.4.11.2.33.2.66 *** m_pd.h 30 Jul 2007 20:11:15 -0000 1.4.4.11.2.33.2.65 --- m_pd.h 31 Jul 2007 00:42:34 -0000 1.4.4.11.2.33.2.66 *************** *** 194,208 **** t_hashentry *m_next; public: ! t_hash(long capa); ! ~t_hash(); size_t size() {return n;} ! hashvalue get(hashkey k); ! void set(hashkey k, hashvalue v); ! hashvalue del(hashkey k); ! int exists(hashkey k); /* check if a key exists */ ! void start(); ! int next(hashkey *kp, hashvalue *vp); #define hash_foreach(k,v,h) for (h->start(); h->next(&k,&v); ) ! long t_hash::hash(hashkey k); }; #endif --- 194,246 ---- t_hashentry *m_next; public: ! t_hash(long capa_) : capa(capa_), n(0), i(0) { ! tab = new t_hashentry *[capa]; ! for (long j=0; j<capa; j++) tab[j]=0; ! } ! ~t_hash() {delete[] tab;} size_t size() {return n;} ! hashvalue get(hashkey k) { ! long h = hash(k); ! for (t_hashentry *e=tab[h]; e; e=e->next) {if (e->k==k) return e->v;} ! return 0; ! } ! void set(hashkey k, hashvalue v) { ! long h = hash(k); ! for (t_hashentry *e=tab[h]; e; e=e->next) {if (e->k==k) {e->v=v; return;}} ! t_hashentry *nu = new t_hashentry; nu->k=k; nu->v=v; nu->next=tab[h]; ! n++; ! tab[h] = nu; ! } ! hashvalue del(hashkey k) { ! long h = hash(k); ! for (t_hashentry **ep=&tab[h]; *ep; ep=&(*ep)->next) { ! if ((*ep)->k==k) { ! hashvalue v=(*ep)->v; ! t_hashentry *next=(*ep)->next; ! delete *ep; n--; ! *ep = next; ! return v; ! } ! } ! return 0; ! } ! int exists(hashkey k) { ! long h = hash(k); ! for (t_hashentry *e=tab[h]; e; e=e->next) {if (e->k==k) return 1;} ! return 0; ! } ! void start() {i=0; m_next=0;} ! int next(hashkey *kp, hashvalue *vp) { ! while (!m_next && i<capa) m_next = tab[i++]; ! if (m_next) { ! *kp = m_next->k; ! *vp = m_next->v; ! m_next = m_next->next; ! return 1; ! } ! return 0; ! } #define hash_foreach(k,v,h) for (h->start(); h->next(&k,&v); ) ! long hash(hashkey k) {return (((long)k*0x54321) & 0x7FFFFFFF)%capa;} }; #endif Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.74 retrieving revision 1.1.2.75 diff -C2 -d -r1.1.2.74 -r1.1.2.75 *** kernel.c 30 Jul 2007 20:11:22 -0000 1.1.2.74 --- kernel.c 31 Jul 2007 00:42:34 -0000 1.1.2.75 *************** *** 108,168 **** t_class *hash_class; - t_hash::t_hash(long capa_) { - capa = capa_; - n=0; - i=0; - tab = new t_hashentry *[capa]; - for (long j=0; j<capa; j++) tab[j]=0; - } - t_hash::~t_hash() {delete[] tab;} - void t_hash::start() {i=0; m_next=0;} - int t_hash::next(hashkey *kp, hashvalue *vp) { - while (!m_next && i<capa) m_next = tab[i++]; - if (m_next) { - *kp = m_next->k; - *vp = m_next->v; - m_next = m_next->next; - return 1; - } - return 0; - } - long t_hash::hash(hashkey k) { - long h = ((long)k*0x54321) & 0x7FFFFFFF; - return h%capa; - } - int t_hash::exists(hashkey k) { - long h = hash(k); - for (t_hashentry *e=tab[h]; e; e=e->next) {if (e->k==k) return 1;} - return 0; - } - hashvalue t_hash::get(hashkey k) { - long h = hash(k); - for (t_hashentry *e=tab[h]; e; e=e->next) {if (e->k==k) return e->v;} - return 0; - } - void t_hash::set(hashkey k, hashvalue v) { - long h = hash(k); - t_hashentry *nu; - for (t_hashentry *e=tab[h]; e; e=e->next) {if (e->k==k) {e->v=v; return;}} - nu = new t_hashentry; - n++; - nu->k=k; - nu->v=v; - nu->next=tab[h]; - tab[h] = nu; - } - hashvalue t_hash::del(hashkey k) { - long h = hash(k); - for (t_hashentry **ep=&tab[h]; *ep; ep=&(*ep)->next) { - if ((*ep)->k==k) { - hashvalue v=(*ep)->v; - t_hashentry *next=(*ep)->next; - delete *ep; n--; - *ep = next; - return v; - } - } - return 0; - } /*extern "C"*/ void hash_setup () { --- 108,111 ---- *************** *** 267,271 **** t_pd *x = (t_pd *)getbytes(c->size); x->_class = c; - //fprintf(stderr,"object_table = %p\n",object_table); object_table->set(x,(void*)1); if (c->gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); --- 210,213 ---- *************** *** 2408,2412 **** void pd_init() { object_table = new t_hash(127); - //fprintf(stderr,"object_table = %p\n",object_table); bindlist_class = class_new(gensym("bindlist"), 0, 0, sizeof(t_bindlist), CLASS_PD, 0); class_addbang(bindlist_class, (t_method)bindlist_bang); --- 2350,2353 ----

1 0

pd/src m_pd.h,1.8.2.10,1.8.2.11
by Hans-Christoph Steiner 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21935 Modified Files: Tag: branch-v0-39-2-extended m_pd.h Log Message: changed version in preparation for final release Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.8.2.10 retrieving revision 1.8.2.11 diff -C2 -d -r1.8.2.10 -r1.8.2.11 *** m_pd.h 18 Jul 2007 14:05:55 -0000 1.8.2.10 --- m_pd.h 31 Jul 2007 00:37:38 -0000 1.8.2.11 *************** *** 12,16 **** #define PD_MINOR_VERSION 39 #define PD_BUGFIX_VERSION 3 ! #define PD_TEST_VERSION "extended-rc5" /* old name for "MSW" flag -- we have to take it for the sake of many old --- 12,16 ---- #define PD_MINOR_VERSION 39 #define PD_BUGFIX_VERSION 3 ! #define PD_TEST_VERSION "extended" /* old name for "MSW" flag -- we have to take it for the sake of many old

1 0

pd/src s_audio_paring.c,1.1.4.1.2.1,1.1.4.1.2.1.2.1
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11847 Modified Files: Tag: desiredata s_audio_paring.c Log Message: cleanup and remove fprintf Index: s_audio_paring.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_paring.c,v retrieving revision 1.1.4.1.2.1 retrieving revision 1.1.4.1.2.1.2.1 diff -C2 -d -r1.1.4.1.2.1 -r1.1.4.1.2.1.2.1 *** s_audio_paring.c 24 Jan 2006 01:29:54 -0000 1.1.4.1.2.1 --- s_audio_paring.c 31 Jul 2007 00:10:37 -0000 1.1.4.1.2.1.2.1 *************** *** 32,40 **** * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * */ /* * modified 2002/07/13 by olaf.matthes(a)gmx.de to allow any number if channels - * */ --- 32,38 ---- *************** *** 45,53 **** #include <string.h> ! /*************************************************************************** ! * Initialize FIFO. ! */ ! long PD_RingBuffer_Init( RingBuffer *rbuf, long numBytes, void *dataPtr ) ! { rbuf->bufferSize = numBytes; rbuf->buffer = (char *)dataPtr; --- 43,48 ---- #include <string.h> ! /* Initialize FIFO. */ ! long PD_RingBuffer_Init(RingBuffer *rbuf, long numBytes, void *dataPtr) { rbuf->bufferSize = numBytes; rbuf->buffer = (char *)dataPtr; *************** *** 57,103 **** /*************************************************************************** ** Return number of bytes available for reading. */ ! long PD_RingBuffer_GetReadAvailable( RingBuffer *rbuf ) ! { long ret = rbuf->writeIndex - rbuf->readIndex; ! if (ret < 0) ! ret += 2 * rbuf->bufferSize; ! if (ret < 0 || ret > rbuf->bufferSize) ! fprintf(stderr, ! "consistency check failed: PD_RingBuffer_GetReadAvailable\n"); ! return ( ret ); } ! /*************************************************************************** ! ** Return number of bytes available for writing. */ ! long PD_RingBuffer_GetWriteAvailable( RingBuffer *rbuf ) ! { ! return ( rbuf->bufferSize - PD_RingBuffer_GetReadAvailable(rbuf)); } ! /*************************************************************************** ! ** Clear buffer. Should only be called when buffer is NOT being read. */ ! void PD_RingBuffer_Flush( RingBuffer *rbuf ) ! { rbuf->writeIndex = rbuf->readIndex = 0; } ! /*************************************************************************** ! ** Get address of region(s) to which we can write data. ! ** If the region is contiguous, size2 will be zero. ! ** If non-contiguous, size2 will be the size of second region. ! ** Returns room available to be written or numBytes, whichever is smaller. ! */ ! long PD_RingBuffer_GetWriteRegions( RingBuffer *rbuf, long numBytes, ! void **dataPtr1, long *sizePtr1, ! void **dataPtr2, long *sizePtr2 ) ! { ! long index; ! long available = PD_RingBuffer_GetWriteAvailable( rbuf ); ! if( numBytes > available ) numBytes = available; /* Check to see if write is not contiguous. */ index = rbuf->writeIndex; ! while (index >= rbuf->bufferSize) ! index -= rbuf->bufferSize; ! if( (index + numBytes) > rbuf->bufferSize ) ! { /* Write data in two blocks that wrap the buffer. */ long firstHalf = rbuf->bufferSize - index; --- 52,83 ---- /*************************************************************************** ** Return number of bytes available for reading. */ ! long PD_RingBuffer_GetReadAvailable(RingBuffer *rbuf) { long ret = rbuf->writeIndex - rbuf->readIndex; ! if (ret < 0) ret += 2 * rbuf->bufferSize; ! if (ret < 0 || ret > rbuf->bufferSize) error("consistency check failed: PD_RingBuffer_GetReadAvailable"); ! return ret; } ! /* Return number of bytes available for writing. */ ! long PD_RingBuffer_GetWriteAvailable(RingBuffer *rbuf) { ! return rbuf->bufferSize - PD_RingBuffer_GetReadAvailable(rbuf); } ! /* Clear buffer. Should only be called when buffer is NOT being read. */ ! void PD_RingBuffer_Flush(RingBuffer *rbuf) { rbuf->writeIndex = rbuf->readIndex = 0; } ! /* Get address of region(s) to which we can write data. If the region is contiguous, size2 will be zero. ! If non-contiguous, size2 will be the size of second region. ! Returns room available to be written or numBytes, whichever is smaller. */ ! long PD_RingBuffer_GetWriteRegions(RingBuffer *rbuf, long numBytes, ! void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2) { ! long index; ! long available = PD_RingBuffer_GetWriteAvailable(rbuf); ! if (numBytes > available) numBytes = available; /* Check to see if write is not contiguous. */ index = rbuf->writeIndex; ! while (index >= rbuf->bufferSize) index -= rbuf->bufferSize; ! if ((index + numBytes) > rbuf->bufferSize) { /* Write data in two blocks that wrap the buffer. */ long firstHalf = rbuf->bufferSize - index; *************** *** 106,112 **** *dataPtr2 = &rbuf->buffer[0]; *sizePtr2 = numBytes - firstHalf; ! } ! else ! { *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = numBytes; --- 86,90 ---- *dataPtr2 = &rbuf->buffer[0]; *sizePtr2 = numBytes - firstHalf; ! } else { *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = numBytes; *************** *** 120,128 **** /*************************************************************************** */ ! long PD_RingBuffer_AdvanceWriteIndex( RingBuffer *rbuf, long numBytes ) ! { ! long ret = (rbuf->writeIndex + numBytes); ! if ( ret >= 2 * rbuf->bufferSize) ! ret -= 2 * rbuf->bufferSize; /* check for end of buffer */ return rbuf->writeIndex = ret; } --- 98,104 ---- /*************************************************************************** */ ! long PD_RingBuffer_AdvanceWriteIndex(RingBuffer *rbuf, long numBytes) { ! long ret = rbuf->writeIndex + numBytes; ! if (ret >= 2 * rbuf->bufferSize) ret -= 2 * rbuf->bufferSize; /* check for end of buffer */ return rbuf->writeIndex = ret; } *************** *** 134,151 **** ** Returns room available to be written or numBytes, whichever is smaller. */ ! long PD_RingBuffer_GetReadRegions( RingBuffer *rbuf, long numBytes, ! void **dataPtr1, long *sizePtr1, ! void **dataPtr2, long *sizePtr2 ) ! { ! long index; ! long available = PD_RingBuffer_GetReadAvailable( rbuf ); ! if( numBytes > available ) numBytes = available; /* Check to see if read is not contiguous. */ index = rbuf->readIndex; ! while (index >= rbuf->bufferSize) ! index -= rbuf->bufferSize; ! ! if( (index + numBytes) > rbuf->bufferSize ) ! { /* Write data in two blocks that wrap the buffer. */ long firstHalf = rbuf->bufferSize - index; --- 110,122 ---- ** Returns room available to be written or numBytes, whichever is smaller. */ ! long PD_RingBuffer_GetReadRegions(RingBuffer *rbuf, long numBytes, ! void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2) { ! long index; ! long available = PD_RingBuffer_GetReadAvailable(rbuf); ! if (numBytes > available) numBytes = available; /* Check to see if read is not contiguous. */ index = rbuf->readIndex; ! while (index >= rbuf->bufferSize) index -= rbuf->bufferSize; ! if ((index + numBytes) > rbuf->bufferSize) { /* Write data in two blocks that wrap the buffer. */ long firstHalf = rbuf->bufferSize - index; *************** *** 154,160 **** *dataPtr2 = &rbuf->buffer[0]; *sizePtr2 = numBytes - firstHalf; ! } ! else ! { *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = numBytes; --- 125,129 ---- *dataPtr2 = &rbuf->buffer[0]; *sizePtr2 = numBytes - firstHalf; ! } else { *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = numBytes; *************** *** 164,194 **** return numBytes; } ! /*************************************************************************** ! */ ! long PD_RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes ) ! { long ret = (rbuf->readIndex + numBytes); ! if( ret >= 2 * rbuf->bufferSize) ! ret -= 2 * rbuf->bufferSize; return rbuf->readIndex = ret; } ! /*************************************************************************** ! ** Return bytes written. */ ! long PD_RingBuffer_Write( RingBuffer *rbuf, const void *data, long numBytes ) ! { long size1, size2, numWritten; void *data1, *data2; numWritten = PD_RingBuffer_GetWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); ! if( size2 > 0 ) ! { ! ! memcpy( data1, data, size1 ); data = ((char *)data) + size1; ! memcpy( data2, data, size2 ); ! } ! else ! { ! memcpy( data1, data, size1 ); } PD_RingBuffer_AdvanceWriteIndex( rbuf, numWritten ); --- 133,154 ---- return numBytes; } ! ! long PD_RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes ) { long ret = (rbuf->readIndex + numBytes); ! if( ret >= 2 * rbuf->bufferSize) ret -= 2 * rbuf->bufferSize; return rbuf->readIndex = ret; } ! /* Return bytes written. */ ! long PD_RingBuffer_Write(RingBuffer *rbuf, const void *data, long numBytes) { long size1, size2, numWritten; void *data1, *data2; numWritten = PD_RingBuffer_GetWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); ! if (size2 > 0) { ! memcpy(data1, data, size1); data = ((char *)data) + size1; ! memcpy(data2, data, size2); ! } else { ! memcpy(data1, data, size1); } PD_RingBuffer_AdvanceWriteIndex( rbuf, numWritten ); *************** *** 196,215 **** } ! /*************************************************************************** ! ** Return bytes read. */ ! long PD_RingBuffer_Read( RingBuffer *rbuf, void *data, long numBytes ) ! { long size1, size2, numRead; void *data1, *data2; numRead = PD_RingBuffer_GetReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); ! if( size2 > 0 ) ! { ! memcpy( data, data1, size1 ); data = ((char *)data) + size1; ! memcpy( data, data2, size2 ); ! } ! else ! { ! memcpy( data, data1, size1 ); } PD_RingBuffer_AdvanceReadIndex( rbuf, numRead ); --- 156,170 ---- } ! /* Return bytes read. */ ! long PD_RingBuffer_Read(RingBuffer *rbuf, void *data, long numBytes) { long size1, size2, numRead; void *data1, *data2; numRead = PD_RingBuffer_GetReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); ! if (size2 > 0) { ! memcpy(data, data1, size1); data = ((char *)data) + size1; ! memcpy(data, data2, size2); ! } else { ! memcpy(data, data1, size1); } PD_RingBuffer_AdvanceReadIndex( rbuf, numRead );

1 0

pd/src s_audio_jack.c,1.5.4.8.2.7.2.12,1.5.4.8.2.7.2.13
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5441 Modified Files: Tag: desiredata s_audio_jack.c Log Message: remove fprintf Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.8.2.7.2.12 retrieving revision 1.5.4.8.2.7.2.13 diff -C2 -d -r1.5.4.8.2.7.2.12 -r1.5.4.8.2.7.2.13 *** s_audio_jack.c 19 Jul 2007 21:09:18 -0000 1.5.4.8.2.7.2.12 --- s_audio_jack.c 30 Jul 2007 23:53:37 -0000 1.5.4.8.2.7.2.13 *************** *** 15,21 **** static jack_nframes_t jack_filled = 0; static float jack_outbuf[NUM_JACK_PORTS*BUF_JACK]; ! static float jack_inbuf[NUM_JACK_PORTS*BUF_JACK]; static int jack_started = 0; ! static jack_port_t *input_port[NUM_JACK_PORTS]; static jack_port_t *output_port[NUM_JACK_PORTS]; static int outport_count = 0; --- 15,21 ---- static jack_nframes_t jack_filled = 0; static float jack_outbuf[NUM_JACK_PORTS*BUF_JACK]; ! static float jack_inbuf[NUM_JACK_PORTS*BUF_JACK]; static int jack_started = 0; ! static jack_port_t * input_port[NUM_JACK_PORTS]; static jack_port_t *output_port[NUM_JACK_PORTS]; static int outport_count = 0; *************** *** 33,37 **** jack_out_max = max(int(nframes),JACK_OUT_MAX); if (jack_filled >= nframes) { ! if (jack_filled != nframes) fprintf(stderr,"Partial read"); for (int j = 0; j < sys_outchannels; j++) { float *out = (float *)jack_port_get_buffer(output_port[j], nframes); --- 33,37 ---- jack_out_max = max(int(nframes),JACK_OUT_MAX); if (jack_filled >= nframes) { ! if (jack_filled != nframes) post("Partial read"); for (int j = 0; j < sys_outchannels; j++) { float *out = (float *)jack_port_get_buffer(output_port[j], nframes); *************** *** 78,86 **** if (status == ETIMEDOUT) { /* we're late ... lets hope that jack doesn't kick us out */ ! post("timeout %d", (timeout)); sys_log_error(ERR_SYSLOCK); return 0; } else { ! post ("sys_timedlock returned %d", status); return 0; } --- 78,86 ---- if (status == ETIMEDOUT) { /* we're late ... lets hope that jack doesn't kick us out */ ! error("timeout %d", (timeout)); sys_log_error(ERR_SYSLOCK); return 0; } else { ! post("sys_timedlock returned %d", status); return 0; } *************** *** 111,115 **** static int jack_ignore_graph_callback = 0; static t_int jack_shutdown_handler(t_int* none) { ! post("jack kicked us out ... trying to reconnect"); jack_ignore_graph_callback = 1; /* clean up */ --- 111,115 ---- static int jack_ignore_graph_callback = 0; static t_int jack_shutdown_handler(t_int* none) { ! error("jack kicked us out ... trying to reconnect"); jack_ignore_graph_callback = 1; /* clean up */ *************** *** 178,182 **** for (int i=0;jack_ports[i] != 0 && i < sys_inchannels;i++) if (jack_connect (jack_client, jack_ports[i], jack_port_name (input_port[i]))) ! fprintf (stderr, "cannot connect input ports %s -> %s\n", jack_ports[i],jack_port_name(input_port[i])); free(jack_ports); jack_ports = jack_get_ports(jack_client, regex_pattern, 0, JackPortIsInput); --- 178,182 ---- for (int i=0;jack_ports[i] != 0 && i < sys_inchannels;i++) if (jack_connect (jack_client, jack_ports[i], jack_port_name (input_port[i]))) ! error("cannot connect input ports %s -> %s", jack_ports[i],jack_port_name(input_port[i])); free(jack_ports); jack_ports = jack_get_ports(jack_client, regex_pattern, 0, JackPortIsInput); *************** *** 184,188 **** for (int i=0;jack_ports[i] != 0 && i < sys_outchannels;i++) if (jack_connect (jack_client, jack_port_name (output_port[i]), jack_ports[i])) ! fprintf (stderr, "cannot connect output ports %s -> %s\n", jack_port_name(output_port[i]),jack_ports[i]); free(jack_ports); return 0; --- 184,188 ---- for (int i=0;jack_ports[i] != 0 && i < sys_outchannels;i++) if (jack_connect (jack_client, jack_port_name (output_port[i]), jack_ports[i])) ! error("cannot connect output ports %s -> %s",jack_port_name(output_port[i]),jack_ports[i]); free(jack_ports); return 0; *************** *** 203,214 **** char port_name[80] = ""; int new_jack = 0; ! if (outchans > NUM_JACK_PORTS) { ! fprintf(stderr,"%d output ports not supported, setting to %d\n",outchans, NUM_JACK_PORTS); ! outchans = NUM_JACK_PORTS; ! } ! if (inchans > NUM_JACK_PORTS) { ! fprintf(stderr,"%d input ports not supported, setting to %d\n",inchans, NUM_JACK_PORTS); ! inchans = NUM_JACK_PORTS; ! } if (jack_client && scheduler != sys_getscheduler()) { jack_client_close(jack_client); --- 203,208 ---- char port_name[80] = ""; int new_jack = 0; ! if (outchans > NUM_JACK_PORTS) {post("%d output ports not supported, setting to %d",outchans, NUM_JACK_PORTS); outchans = NUM_JACK_PORTS;} ! if ( inchans > NUM_JACK_PORTS) {post( "%d input ports not supported, setting to %d", inchans, NUM_JACK_PORTS); inchans = NUM_JACK_PORTS;} if (jack_client && scheduler != sys_getscheduler()) { jack_client_close(jack_client); *************** *** 273,278 **** /* tell the JACK server that we are ready to roll */ if (new_jack) { ! if (jack_activate (jack_client)) { ! fprintf (stderr, "cannot activate client\n"); sys_inchannels = sys_outchannels = 0; return 1;} memset(jack_outbuf,0,sizeof(jack_outbuf)); if (jack_client_names[0]) jack_connect_ports(jack_client_names[0]); --- 267,271 ---- /* tell the JACK server that we are ready to roll */ if (new_jack) { ! if (jack_activate (jack_client)) {error("cannot activate client"); sys_inchannels = sys_outchannels = 0; return 1;} memset(jack_outbuf,0,sizeof(jack_outbuf)); if (jack_client_names[0]) jack_connect_ports(jack_client_names[0]); *************** *** 337,341 **** } ! void jack_listdevs () {post("device listing not implemented for jack yet\n");} static const char ** jack_in_connections[NUM_JACK_PORTS]; /* ports connected to the inputs */ --- 330,334 ---- } ! void jack_listdevs () {error("device listing not implemented for jack yet\n");} static const char ** jack_in_connections[NUM_JACK_PORTS]; /* ports connected to the inputs */ *************** *** 366,370 **** if (!port) break; /* we've connected all incoming ports */ int status = jack_connect(jack_client, port, jack_port_name(input_port[i])); ! if (status) post("cannot connect input ports %s -> %s", port, jack_port_name (input_port[i])); } } --- 359,363 ---- if (!port) break; /* we've connected all incoming ports */ int status = jack_connect(jack_client, port, jack_port_name(input_port[i])); ! if (status) error("cannot connect input ports %s -> %s", port, jack_port_name (input_port[i])); } } *************** *** 375,379 **** if (!port) break; /* we've connected all outgoing ports */ int status = jack_connect(jack_client, jack_port_name(output_port[i]), port); ! if (status) post("cannot connect output ports %s -> %s", jack_port_name(output_port[i]), port); } } --- 368,372 ---- if (!port) break; /* we've connected all outgoing ports */ int status = jack_connect(jack_client, jack_port_name(output_port[i]), port); ! if (status) error("cannot connect output ports %s -> %s", jack_port_name(output_port[i]), port); } }

1 0

pd/src s_audio_alsa.c,1.5.4.5.2.2.2.10,1.5.4.5.2.2.2.11
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3534 Modified Files: Tag: desiredata s_audio_alsa.c Log Message: remove fprintf Index: s_audio_alsa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_alsa.c,v retrieving revision 1.5.4.5.2.2.2.10 retrieving revision 1.5.4.5.2.2.2.11 diff -C2 -d -r1.5.4.5.2.2.2.10 -r1.5.4.5.2.2.2.11 *** s_audio_alsa.c 10 Jul 2007 16:15:00 -0000 1.5.4.5.2.2.2.10 --- s_audio_alsa.c 30 Jul 2007 23:48:34 -0000 1.5.4.5.2.2.2.11 *************** *** 1,4 **** ! /* Copyright (c) 1997-2003 Guenter Geiger, Miller Puckette, Larry Troxler, ! * Winfried Ritsch, Karl MacMillan, and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ --- 1,3 ---- ! /* Copyright (c) 1997-2003 Guenter Geiger, Miller Puckette, Larry Troxler, Winfried Ritsch, Karl MacMillan, and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ *************** *** 59,65 **** int alsa_noutdev; ! static void check_error(int err, const char *why) { ! if (err < 0) fprintf(stderr, "%s: %s\n", why, snd_strerror(err)); ! } static int alsaio_canmmap(t_alsa_dev *dev) { --- 58,62 ---- int alsa_noutdev; ! static void check_error(int err, const char *why) {if (err<0) error("%s: %s", why, snd_strerror(err));} static int alsaio_canmmap(t_alsa_dev *dev) { *************** *** 77,81 **** } else err2 = -1; #if 0 ! post("err 1 %d (%s), err2 %d (%s)", err1, snd_strerror(err1), err2, snd_strerror(err2)); #endif return err1<0 && err2>=0; --- 74,78 ---- } else err2 = -1; #if 0 ! error("err 1 %d (%s), err2 %d (%s)", err1, snd_strerror(err1), err2, snd_strerror(err2)); #endif return err1<0 && err2>=0; *************** *** 102,107 **** /* Try to set 32 bit format first */ err = snd_pcm_hw_params_set_format(dev->a_handle, hw_params, SND_PCM_FORMAT_S32); ! if (err < 0) { ! /* fprintf(stderr,"PD-ALSA: 32 bit format not available - using 16\n"); */ err = snd_pcm_hw_params_set_format(dev->a_handle, hw_params,SND_PCM_FORMAT_S16); check_error(err, "snd_pcm_hw_params_set_format"); --- 99,104 ---- /* Try to set 32 bit format first */ err = snd_pcm_hw_params_set_format(dev->a_handle, hw_params, SND_PCM_FORMAT_S32); ! if (err<0) { ! error("PD-ALSA: 32 bit format not available - using 16"); err = snd_pcm_hw_params_set_format(dev->a_handle, hw_params,SND_PCM_FORMAT_S16); check_error(err, "snd_pcm_hw_params_set_format"); *************** *** 116,121 **** err = snd_pcm_hw_params_set_channels_min(dev->a_handle, hw_params, &tmp_uint); check_error(err, "snd_pcm_hw_params_set_channels"); ! if (tmp_uint != (unsigned)*channels) ! post("ALSA: set input channels to %d", tmp_uint); *channels = tmp_uint; dev->a_channels = *channels; --- 113,117 ---- err = snd_pcm_hw_params_set_channels_min(dev->a_handle, hw_params, &tmp_uint); check_error(err, "snd_pcm_hw_params_set_channels"); ! if (tmp_uint != (unsigned)*channels) post("ALSA: set input channels to %d", tmp_uint); *channels = tmp_uint; dev->a_channels = *channels; *************** *** 159,174 **** if (alsa_snd_buf) { if (alsa_snd_bufsize < bufsizeforthis) { ! if (!(alsa_snd_buf = (char *)realloc(alsa_snd_buf, bufsizeforthis))) { ! post("out of memory"); ! return 0; ! } memset(alsa_snd_buf, 0, bufsizeforthis); alsa_snd_bufsize = bufsizeforthis; } } else { ! if (!(alsa_snd_buf = (char *)malloc(bufsizeforthis))) { ! post("out of memory"); ! return 0; ! } memset(alsa_snd_buf, 0, bufsizeforthis); alsa_snd_bufsize = bufsizeforthis; --- 155,164 ---- if (alsa_snd_buf) { if (alsa_snd_bufsize < bufsizeforthis) { ! if (!(alsa_snd_buf = (char *)realloc(alsa_snd_buf, bufsizeforthis))) {error("out of memory"); return 0;} memset(alsa_snd_buf, 0, bufsizeforthis); alsa_snd_bufsize = bufsizeforthis; } } else { ! if (!(alsa_snd_buf = (char *)malloc(bufsizeforthis))) {error("out of memory"); return 0;} memset(alsa_snd_buf, 0, bufsizeforthis); alsa_snd_bufsize = bufsizeforthis; *************** *** 305,309 **** timenow = sys_getrealtime(); #ifdef DEBUG_ALSA_XFER ! if (timenow - timelast > 0.050) fprintf(stderr, "(%d)", int(1000 * (timenow - timelast))), fflush(stderr); callno++; #endif --- 295,299 ---- timenow = sys_getrealtime(); #ifdef DEBUG_ALSA_XFER ! if (timenow - timelast > 0.050) post("(%d)", int(1000 * (timenow - timelast))), fflush(stderr); callno++; #endif *************** *** 343,350 **** if (result != (int)transfersize) { #ifdef DEBUG_ALSA_XFER ! if (result >= 0 || errno == EAGAIN) ! fprintf(stderr, "ALSA: write returned %d of %d\n", result, transfersize); ! else fprintf(stderr, "ALSA: write: %s\n", snd_strerror(errno)); ! fprintf(stderr, "inputcount %d, outputcount %d, outbufsize %d\n", inputcount, outputcount, (ALSA_EXTRABUFFER + sys_advance_samples) * alsa_outdev[iodev].a_sampwidth * outchannels); #endif --- 333,339 ---- if (result != (int)transfersize) { #ifdef DEBUG_ALSA_XFER ! if (result >= 0 || errno == EAGAIN) post("ALSA: write returned %d of %d\n", result, transfersize); ! else error("ALSA: write: %s", snd_strerror(errno)); ! post("inputcount %d, outputcount %d, outbufsize %d", inputcount, outputcount, (ALSA_EXTRABUFFER + sys_advance_samples) * alsa_outdev[iodev].a_sampwidth * outchannels); #endif *************** *** 358,362 **** if (sys_getrealtime() - timenow > 0.002) { #ifdef DEBUG_ALSA_XFER ! fprintf(stderr, "output %d took %d msec\n", callno, int(1000 * (timenow - timelast))), fflush(stderr); #endif timenow = sys_getrealtime(); --- 347,351 ---- if (sys_getrealtime() - timenow > 0.002) { #ifdef DEBUG_ALSA_XFER ! post("output %d took %d msec", callno, int(1000 * (timenow - timelast))), fflush(stderr); #endif timenow = sys_getrealtime(); *************** *** 372,379 **** if (result < (int)transfersize) { #ifdef DEBUG_ALSA_XFER ! if (result < 0) ! fprintf(stderr, "snd_pcm_read %d %d: %s\n", callno, xferno, snd_strerror(errno)); ! else fprintf(stderr, "snd_pcm_read %d %d returned only %d\n", callno, xferno, result); ! fprintf(stderr, "inputcount %d, outputcount %d, inbufsize %d\n", inputcount, outputcount, (ALSA_EXTRABUFFER + sys_advance_samples) * alsa_indev[iodev].a_sampwidth * inchannels); #endif --- 361,367 ---- if (result < (int)transfersize) { #ifdef DEBUG_ALSA_XFER ! if (result<0) error("snd_pcm_read %d %d: %s", callno, xferno, snd_strerror(errno)); ! else post("snd_pcm_read %d %d returned only %d", callno, xferno, result); ! post("inputcount %d, outputcount %d, inbufsize %d", inputcount, outputcount, (ALSA_EXTRABUFFER + sys_advance_samples) * alsa_indev[iodev].a_sampwidth * inchannels); #endif *************** *** 382,391 **** } if (alsa_indev[iodev].a_sampwidth == 4) { ! for (i = 0; i < chans; i++, ch++, fp1 += sys_dacblocksize) { for (j = ch, k = sys_dacblocksize, fp2 = fp1; k--; j += thisdevchans, fp2++) *fp2 = (float) ((t_alsa_sample32 *)alsa_snd_buf)[j] * (1./ INT32_MAX); } } else { ! for (i = 0; i < chans; i++, ch++, fp1 += sys_dacblocksize) { for (j = ch, k = sys_dacblocksize, fp2 = fp1; k--; j += thisdevchans, fp2++) *fp2 = (float) ((t_alsa_sample16 *)alsa_snd_buf)[j] * 3.051850e-05; --- 370,379 ---- } if (alsa_indev[iodev].a_sampwidth == 4) { ! for (int i=0; i<chans; i++, ch++, fp1 += sys_dacblocksize) { for (j = ch, k = sys_dacblocksize, fp2 = fp1; k--; j += thisdevchans, fp2++) *fp2 = (float) ((t_alsa_sample32 *)alsa_snd_buf)[j] * (1./ INT32_MAX); } } else { ! for (int i=0; i<chans; i++, ch++, fp1 += sys_dacblocksize) { for (j = ch, k = sys_dacblocksize, fp2 = fp1; k--; j += thisdevchans, fp2++) *fp2 = (float) ((t_alsa_sample16 *)alsa_snd_buf)[j] * 3.051850e-05; *************** *** 398,402 **** if (sys_getrealtime() - timenow > 0.002) { #ifdef DEBUG_ALSA_XFER ! fprintf(stderr, "routine took %d msec\n", int(1000 * (sys_getrealtime() - timenow))); #endif sys_log_error(ERR_ADCSLEPT); --- 386,390 ---- if (sys_getrealtime() - timenow > 0.002) { #ifdef DEBUG_ALSA_XFER ! post("routine took %d msec", int(1000 * (sys_getrealtime() - timenow))); #endif sys_log_error(ERR_ADCSLEPT); *************** *** 414,422 **** if (sys_inchannels) { result = snd_pcm_delay(alsa_indev[iodev].a_handle, &indelay); ! if (result < 0) post("snd_pcm_delay 1 failed"); else post("in delay %d", indelay); } if (sys_outchannels) { result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); ! if (result < 0) post("snd_pcm_delay 2 failed"); else post("out delay %d", outdelay); } post("sum %d (%d mod 64)\n", indelay + outdelay, (indelay+outdelay)%64); --- 402,410 ---- if (sys_inchannels) { result = snd_pcm_delay(alsa_indev[iodev].a_handle, &indelay); ! if (result<0) error("snd_pcm_delay 1 failed"); else post( "in delay %d", indelay); } if (sys_outchannels) { result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); ! if (result<0) error("snd_pcm_delay 2 failed"); else post("out delay %d", outdelay); } post("sum %d (%d mod 64)\n", indelay + outdelay, (indelay+outdelay)%64); *************** *** 465,469 **** /* call this only if both input and output are open */ static void alsa_checkiosync() { ! int result, giveup = 1000, alreadylogged = 0, iodev = 0; snd_pcm_sframes_t minphase, maxphase, thisphase, outdelay; while (1) { --- 453,457 ---- /* call this only if both input and output are open */ static void alsa_checkiosync() { ! int result, giveup = 1000, alreadylogged = 0; snd_pcm_sframes_t minphase, maxphase, thisphase, outdelay; while (1) { *************** *** 475,487 **** minphase = 0x7fffffff; maxphase = -0x7fffffff; ! for (iodev=0; iodev<alsa_noutdev; iodev++) { ! result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); if (result < 0) { snd_pcm_prepare(alsa_outdev[iodev].a_handle); result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); } ! if (result < 0) { ! post("output snd_pcm_delay failed: %s", snd_strerror(result)); ! if (snd_pcm_status(alsa_outdev[iodev].a_handle, alsa_status) < 0) post("output snd_pcm_status failed"); else post("astate %d", snd_pcm_status_get_state(alsa_status)); return; --- 463,475 ---- minphase = 0x7fffffff; maxphase = -0x7fffffff; ! for (int iodev=0; iodev<alsa_noutdev; iodev++) { ! result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); if (result < 0) { snd_pcm_prepare(alsa_outdev[iodev].a_handle); result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); } ! if (result<0) { ! error("output snd_pcm_delay failed: %s", snd_strerror(result)); ! if (snd_pcm_status(alsa_outdev[iodev].a_handle, alsa_status)<0) error("output snd_pcm_status failed"); else post("astate %d", snd_pcm_status_get_state(alsa_status)); return; *************** *** 493,497 **** sys_log_error(ERR_DATALATE), alreadylogged = 1; } ! for (iodev=0; iodev<alsa_nindev; iodev++) { result = snd_pcm_delay(alsa_indev[iodev].a_handle, &thisphase); if (result < 0) { --- 481,485 ---- sys_log_error(ERR_DATALATE), alreadylogged = 1; } ! for (int iodev=0; iodev<alsa_nindev; iodev++) { result = snd_pcm_delay(alsa_indev[iodev].a_handle, &thisphase); if (result < 0) { *************** *** 500,506 **** } if (result < 0) { ! post("output snd_pcm_delay failed: %s", snd_strerror(result)); ! if (snd_pcm_status(alsa_outdev[iodev].a_handle, alsa_status) < 0) ! post("output snd_pcm_status failed"); else post("astate %d", snd_pcm_status_get_state(alsa_status)); return; --- 488,493 ---- } if (result < 0) { ! error("output snd_pcm_delay failed: %s", snd_strerror(result)); ! if (snd_pcm_status(alsa_outdev[iodev].a_handle, alsa_status) < 0) error("output snd_pcm_status failed"); else post("astate %d", snd_pcm_status_get_state(alsa_status)); return; *************** *** 509,519 **** if (thisphase > maxphase) maxphase = thisphase; } ! /* the "correct" position is for all the phases to be exactly ! equal; but since we only make corrections sys_dacblocksize samples ! at a time, we just ask that the spread be not more than 3/4 of a block. */ if (maxphase <= minphase + (alsa_jittermax * (sys_dacblocksize / 4))) break; ! if (!alreadylogged) ! sys_log_error(ERR_RESYNC), alreadylogged = 1; ! for (iodev = 0; iodev < alsa_noutdev; iodev++) { result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); if (result < 0) break; --- 496,505 ---- if (thisphase > maxphase) maxphase = thisphase; } ! /* the "correct" position is for all the phases to be exactly equal; ! but since we only make corrections sys_dacblocksize samples at a time, ! we just ask that the spread be not more than 3/4 of a block. */ if (maxphase <= minphase + (alsa_jittermax * (sys_dacblocksize / 4))) break; ! if (!alreadylogged) sys_log_error(ERR_RESYNC), alreadylogged = 1; ! for (int iodev=0; iodev<alsa_noutdev; iodev++) { result = snd_pcm_delay(alsa_outdev[iodev].a_handle, &outdelay); if (result < 0) break; *************** *** 522,530 **** alsa_putzeros(iodev, 1); #if DEBUGSYNC ! fprintf(stderr, "putz %d %d\n", (int)thisphase, (int)minphase); #endif } } ! for (iodev = 0; iodev < alsa_nindev; iodev++) { result = snd_pcm_delay(alsa_indev[iodev].a_handle, &thisphase); if (result < 0) break; --- 508,516 ---- alsa_putzeros(iodev, 1); #if DEBUGSYNC ! post("putz %d %d", (int)thisphase, (int)minphase); #endif } } ! for (int iodev=0; iodev<alsa_nindev; iodev++) { result = snd_pcm_delay(alsa_indev[iodev].a_handle, &thisphase); if (result < 0) break; *************** *** 532,536 **** alsa_getzeros(iodev, 1); #if DEBUGSYNC ! fprintf(stderr, "getz %d %d\n", (int)thisphase, (int)minphase); #endif } --- 518,522 ---- alsa_getzeros(iodev, 1); #if DEBUGSYNC ! post("getz %d %d", (int)thisphase, (int)minphase); #endif } *************** *** 538,543 **** } #if DEBUGSYNC ! if (alreadylogged) ! fprintf(stderr, "done\n"); #endif } --- 524,528 ---- } #if DEBUGSYNC ! if (alreadylogged) post("done"); #endif } *************** *** 576,582 **** if (2 * ndev + 2 > maxndev) break; /* apparently, "cardno" is just a counter; but check that here */ ! if (ndev != cardno) fprintf(stderr, "oops: ALSA cards not reported in order?\n"); sprintf(devname, "hw:%d", cardno); ! /* fprintf(stderr, "\ntry %s...\n", devname); */ if (snd_ctl_open(&ctl, devname, 0) >= 0) { snd_ctl_card_info_malloc(&info); --- 561,567 ---- if (2 * ndev + 2 > maxndev) break; /* apparently, "cardno" is just a counter; but check that here */ ! if (ndev != cardno) post("oops: ALSA cards not reported in order?"); sprintf(devname, "hw:%d", cardno); ! /* post("try %s..", devname); */ if (snd_ctl_open(&ctl, devname, 0) >= 0) { snd_ctl_card_info_malloc(&info); *************** *** 585,589 **** snd_ctl_card_info_free(info); } else { ! fprintf(stderr, "ALSA card scan error\n"); desc = strdup("???"); } --- 570,574 ---- snd_ctl_card_info_free(info); } else { ! error("ALSA card scan error"); desc = strdup("???"); }

1 0

pd/src s_audio_pa.c,1.4.4.7.2.5.2.3,1.4.4.7.2.5.2.4
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv873 Modified Files: Tag: desiredata s_audio_pa.c Log Message: cleanup Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.7.2.5.2.3 retrieving revision 1.4.4.7.2.5.2.4 diff -C2 -d -r1.4.4.7.2.5.2.3 -r1.4.4.7.2.5.2.4 *** s_audio_pa.c 30 Jul 2007 23:36:20 -0000 1.4.4.7.2.5.2.3 --- s_audio_pa.c 30 Jul 2007 23:41:34 -0000 1.4.4.7.2.5.2.4 *************** *** 205,326 **** #ifdef PABLOCKING /* tb: blocking IO isn't really working for v19 yet */ double timenow, timebefore; ! if ((pa_inchans && Pa_GetStreamReadAvailable(pa_stream) < sys_dacblocksize*0.8) && ! (pa_outchans && Pa_GetStreamWriteAvailable(pa_stream) ! < sys_dacblocksize*0.8)) ! { ! /* we can't transfer data ... wait in the scheduler */ ! return SENDDACS_NO; ! } ! ! timebefore = sys_getrealtime(); ! ! if (pa_outchans) ! Pa_WriteStream(pa_stream, &sys_soundout, sys_dacblocksize); ! if (pa_inchans) ! Pa_ReadStream(pa_stream, &sys_soundin, sys_dacblocksize); zerovec(sys_soundout, pa_inchans * sys_dacblocksize); ! ! while ( (pa_inchans && Pa_GetStreamReadAvailable(pa_stream) ! < sys_dacblocksize*0.8) && ! (pa_outchans && Pa_GetStreamWriteAvailable(pa_stream) ! < sys_dacblocksize*0.8)) ! { ! if (pa_outchans) ! Pa_WriteStream(pa_stream, &sys_soundout, sys_dacblocksize); ! if (pa_inchans) ! Pa_ReadStream(pa_stream, &sys_soundin, sys_dacblocksize); ! zerovec(sys_soundout, pa_inchans * sys_dacblocksize); ! ! sched_tick(sys_time + sys_time_per_dsp_tick); ! } ! ! if (sys_getrealtime() > timebefore + sys_sleepgrain * 1e-6) ! { ! return SENDDACS_SLEPT; ! } ! else ! return SENDDACS_YES; ! #else /* for now we're using pablio */ - float *samples, *fp1, *fp2; int i, j; double timebefore; ! ! samples=(float*)alloca(sizeof(float) * MAX_PA_CHANS * sys_dacblocksize); ! timebefore = sys_getrealtime(); if ((pa_inchans && PD_GetAudioStreamReadable(pablio_stream) < sys_dacblocksize) || ! (pa_outchans && PD_GetAudioStreamWriteable(pablio_stream) < sys_dacblocksize)) ! { ! if (pa_inchans && pa_outchans) ! { int synced = 0; ! while (PD_GetAudioStreamWriteable(pablio_stream) > 2*sys_dacblocksize) ! { for (j = 0; j < pa_outchans; j++) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, ! fp2 += pa_outchans) ! { ! *fp2 = 0; ! } synced = 1; PD_WriteAudioStream(pablio_stream, samples, sys_dacblocksize); } ! while (PD_GetAudioStreamReadable(pablio_stream) > 2*sys_dacblocksize) ! { synced = 1; PD_ReadAudioStream(pablio_stream, samples, sys_dacblocksize); } ! /* if (synced) */ ! /* post("sync"); */ } ! return (SENDDACS_NO); } ! if (pa_inchans) ! { PD_ReadAudioStream(pablio_stream, samples, sys_dacblocksize); for (j = 0, fp1 = sys_soundin; j < pa_inchans; j++, fp1 += sys_dacblocksize) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, ! fp2 += pa_inchans) ! { ! fp1[i] = *fp2; ! } } ! if (pa_outchans) ! { ! for (j = 0, fp1 = sys_soundout; j < pa_outchans; j++, ! fp1 += sys_dacblocksize) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, ! fp2 += pa_outchans) ! { ! *fp2 = fp1[i]; ! fp1[i] = 0; ! } PD_WriteAudioStream(pablio_stream, samples, sys_dacblocksize); } ! ! if (sys_getrealtime() > timebefore + sys_sleepgrain * 1e-6) ! { ! /* post("slept"); */ ! return (SENDDACS_SLEPT); ! } ! else return (SENDDACS_YES); ! #endif } ! ! ! void pa_listdevs(void) /* lifted from pa_devs.c in portaudio */ ! { ! int i,j; ! int numDevices; ! const PaDeviceInfo *pdi; ! PaError err; Pa_Initialize(); numDevices = Pa_GetDeviceCount(); ! if( numDevices < 0 ) ! { fprintf(stderr, "ERROR: Pa_GetDeviceCount returned %d\n", numDevices ); err = numDevices; --- 205,281 ---- #ifdef PABLOCKING /* tb: blocking IO isn't really working for v19 yet */ double timenow, timebefore; ! if (( pa_inchans && Pa_GetStreamReadAvailable(pa_stream) < sys_dacblocksize*0.8) && ! (pa_outchans && Pa_GetStreamWriteAvailable(pa_stream) < sys_dacblocksize*0.8)) { ! /* we can't transfer data ... wait in the scheduler */ ! return SENDDACS_NO; ! } ! timebefore = sys_getrealtime(); ! if (pa_outchans) Pa_WriteStream(pa_stream, &sys_soundout, sys_dacblocksize); ! if ( pa_inchans) Pa_ReadStream(pa_stream, &sys_soundin, sys_dacblocksize); ! zerovec(sys_soundout, pa_inchans * sys_dacblocksize); ! while (( pa_inchans && Pa_GetStreamReadAvailable(pa_stream) < sys_dacblocksize*0.8) && ! (pa_outchans && Pa_GetStreamWriteAvailable(pa_stream) < sys_dacblocksize*0.8)) { ! if (pa_outchans) Pa_WriteStream(pa_stream, &sys_soundout, sys_dacblocksize); ! if ( pa_inchans) Pa_ReadStream(pa_stream, &sys_soundin, sys_dacblocksize); zerovec(sys_soundout, pa_inchans * sys_dacblocksize); ! sched_tick(sys_time + sys_time_per_dsp_tick); ! } ! if (sys_getrealtime() > timebefore + sys_sleepgrain * 1e-6) { ! return SENDDACS_SLEPT; ! } else return SENDDACS_YES; #else /* for now we're using pablio */ float *samples, *fp1, *fp2; int i, j; double timebefore; ! samples=(float*)alloca(sizeof(float) * MAX_PA_CHANS * sys_dacblocksize); timebefore = sys_getrealtime(); if ((pa_inchans && PD_GetAudioStreamReadable(pablio_stream) < sys_dacblocksize) || ! (pa_outchans && PD_GetAudioStreamWriteable(pablio_stream) < sys_dacblocksize)) { ! if (pa_inchans && pa_outchans) { int synced = 0; ! while (PD_GetAudioStreamWriteable(pablio_stream) > 2*sys_dacblocksize) { for (j = 0; j < pa_outchans; j++) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, fp2 += pa_outchans) ! *fp2 = 0; synced = 1; PD_WriteAudioStream(pablio_stream, samples, sys_dacblocksize); } ! while (PD_GetAudioStreamReadable(pablio_stream) > 2*sys_dacblocksize) { synced = 1; PD_ReadAudioStream(pablio_stream, samples, sys_dacblocksize); } ! /* if (synced) post("sync"); */ } ! return SENDDACS_NO; } ! if (pa_inchans) { PD_ReadAudioStream(pablio_stream, samples, sys_dacblocksize); for (j = 0, fp1 = sys_soundin; j < pa_inchans; j++, fp1 += sys_dacblocksize) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, fp2 += pa_inchans) ! fp1[i] = *fp2; } ! if (pa_outchans) { ! for (j = 0, fp1 = sys_soundout; j < pa_outchans; j++, fp1 += sys_dacblocksize) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, fp2 += pa_outchans) { ! *fp2 = fp1[i]; ! fp1[i] = 0; ! } PD_WriteAudioStream(pablio_stream, samples, sys_dacblocksize); } ! if (sys_getrealtime() > timebefore + sys_sleepgrain * 1e-6) { ! /* post("slept"); */ ! return SENDDACS_SLEPT; ! } else return SENDDACS_YES; #endif } ! void pa_listdevs() /* lifted from pa_devs.c in portaudio */ { ! int i,j; ! int numDevices; ! const PaDeviceInfo *pdi; ! PaError err; Pa_Initialize(); numDevices = Pa_GetDeviceCount(); ! if (numDevices<0) { fprintf(stderr, "ERROR: Pa_GetDeviceCount returned %d\n", numDevices ); err = numDevices; *************** *** 328,388 **** } fprintf(stderr, "Audio Devices:\n"); ! for( i=0; i<numDevices; i++ ) ! { ! const PaDeviceInfo *pdi = Pa_GetDeviceInfo( i ); ! post ("device %s", pdi->name); ! fprintf(stderr, "device %d:", i+1 ); ! fprintf(stderr, " %s;", pdi->name ); ! fprintf(stderr, "%d inputs, ", pdi->maxInputChannels ); ! fprintf(stderr, "%d outputs", pdi->maxOutputChannels ); #ifdef PA19 ! if ( i == Pa_GetDefaultInputDevice() ) ! fprintf(stderr, " (Default Input)"); ! if ( i == Pa_GetDefaultOutputDevice() ) ! fprintf(stderr, " (Default Output)"); #else ! if ( i == Pa_GetDefaultInputDeviceID() ) ! fprintf(stderr, " (Default Input)"); ! if ( i == Pa_GetDefaultOutputDeviceID() ) ! fprintf(stderr, " (Default Output)"); #endif fprintf(stderr, "\n"); } - fprintf(stderr, "\n"); return; - error: ! fprintf( stderr, "An error occured while using the portaudio stream\n" ); ! fprintf( stderr, "Error number: %d\n", err ); ! fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); } - - /* scanning for devices */ ! void pa_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int *canmulti, ! int maxndev, int devdescsize) ! { int i, nin = 0, nout = 0, ndev; *canmulti = 1; /* one dev each for input and output */ - Pa_Initialize(); ndev = Pa_GetDeviceCount(); ! for (i = 0; i < ndev; i++) ! { const PaDeviceInfo *pdi = Pa_GetDeviceInfo(i); ! if (pdi->maxInputChannels > 0 && nin < maxndev) ! { ! sprintf(indevlist + nin * devdescsize, "(%d)%s", ! pdi->hostApi,pdi->name); /* strcpy(indevlist + nin * devdescsize, pdi->name); */ nin++; } ! if (pdi->maxOutputChannels > 0 && nout < maxndev) ! { ! sprintf(outdevlist + nout * devdescsize, "(%d)%s", ! pdi->hostApi,pdi->name); /* strcpy(outdevlist + nout * devdescsize, pdi->name); */ nout++; --- 283,325 ---- } fprintf(stderr, "Audio Devices:\n"); ! for (i=0; i<numDevices; i++) { ! const PaDeviceInfo *pdi = Pa_GetDeviceInfo(i); ! post("device %s", pdi->name); ! fprintf(stderr, "device %d:", i+1); ! fprintf(stderr, " %s;", pdi->name); ! fprintf(stderr, "%d inputs, ", pdi->maxInputChannels); ! fprintf(stderr, "%d outputs", pdi->maxOutputChannels); #ifdef PA19 ! if (i == Pa_GetDefaultInputDevice ()) fprintf(stderr, " (Default Input)"); ! if (i == Pa_GetDefaultOutputDevice()) fprintf(stderr, " (Default Output)"); #else ! if (i == Pa_GetDefaultInputDeviceID ()) fprintf(stderr, " (Default Input)"); ! if (i == Pa_GetDefaultOutputDeviceID()) fprintf(stderr, " (Default Output)"); #endif fprintf(stderr, "\n"); } fprintf(stderr, "\n"); return; error: ! fprintf(stderr, "An error occured while using the portaudio stream\n"); ! fprintf(stderr, "Error number: %d\n",err); ! fprintf(stderr, "Error message: %s\n",Pa_GetErrorText(err)); } /* scanning for devices */ ! void pa_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize) { int i, nin = 0, nout = 0, ndev; *canmulti = 1; /* one dev each for input and output */ Pa_Initialize(); ndev = Pa_GetDeviceCount(); ! for (i = 0; i < ndev; i++) { const PaDeviceInfo *pdi = Pa_GetDeviceInfo(i); ! if (pdi->maxInputChannels > 0 && nin < maxndev) { ! sprintf(indevlist + nin * devdescsize, "(%d)%s", pdi->hostApi,pdi->name); /* strcpy(indevlist + nin * devdescsize, pdi->name); */ nin++; } ! if (pdi->maxOutputChannels > 0 && nout < maxndev) { ! sprintf(outdevlist + nout * devdescsize, "(%d)%s", pdi->hostApi,pdi->name); /* strcpy(outdevlist + nout * devdescsize, pdi->name); */ nout++;

1 0

pd/src s_audio_pa.c,1.4.4.7.2.5.2.2,1.4.4.7.2.5.2.3
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31408 Modified Files: Tag: desiredata s_audio_pa.c Log Message: cleanup Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.7.2.5.2.2 retrieving revision 1.4.4.7.2.5.2.3 diff -C2 -d -r1.4.4.7.2.5.2.2 -r1.4.4.7.2.5.2.3 *** s_audio_pa.c 30 Jun 2007 20:28:14 -0000 1.4.4.7.2.5.2.2 --- s_audio_pa.c 30 Jul 2007 23:36:20 -0000 1.4.4.7.2.5.2.3 *************** *** 17,21 **** #include <errno.h> - #ifdef MSW /* jmz thinks that we have to include: --- 17,20 ---- *************** *** 23,32 **** * on linux: <alloca.h> (might be true for osX too, no way to check right now...) */ ! # include <malloc.h> #else # include <alloca.h> #endif - #ifdef MSW #include "pthread.h" /* for ETIMEDOUT */ --- 22,30 ---- * on linux: <alloca.h> (might be true for osX too, no way to check right now...) */ ! #zinclude <malloc.h> #else # include <alloca.h> #endif #ifdef MSW #include "pthread.h" /* for ETIMEDOUT */ *************** *** 36,40 **** /* portaudio's blocking api is not working, yet: */ ! /* #define PABLOCKING */ //#ifndef PABLOCKING --- 34,38 ---- /* portaudio's blocking api is not working, yet: */ ! /* #define PABLOCKING */ //#ifndef PABLOCKING *************** *** 48,103 **** static PaStreamCallback *pa_callback = NULL; ! int process (const void *input, void *output, unsigned long frameCount, ! const PaStreamCallbackTimeInfo* timeInfo, ! PaStreamCallbackFlags statusFlags, void *userData); ! int pa_open_audio(int inchans, int outchans, int rate, int advance, ! int indeviceno, int outdeviceno, int schedmode) ! { PaError err; int j, devno, pa_indev = -1, pa_outdev = -1; ! ! if (schedmode == 1) ! pa_callback = process; ! else ! pa_callback = NULL; ! ! sys_setscheduler(schedmode); ! ! /* Initialize PortAudio */ ! err = Pa_Initialize(); ! if ( err != paNoError ) ! { ! fprintf( stderr, ! "Error number %d occured initializing portaudio\n", ! err); ! fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); ! return (1); ! } ! ! /* post("in %d out %d rate %d device %d", inchans, outchans, rate, deviceno); */ ! if (inchans > MAX_PA_CHANS) ! { ! post("input channels reduced to maximum %d", MAX_PA_CHANS); ! inchans = MAX_PA_CHANS; ! } ! if (outchans > MAX_PA_CHANS) ! { ! post("output channels reduced to maximum %d", MAX_PA_CHANS); ! outchans = MAX_PA_CHANS; } ! ! if (inchans > 0) ! { ! for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) ! { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxInputChannels; ! if (maxchans > 0) ! { ! if (devno == indeviceno) ! { ! if (maxchans < inchans) ! inchans = maxchans; pa_indev = j; break; --- 46,74 ---- static PaStreamCallback *pa_callback = NULL; ! int process (const void *input, void *output, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo, ! PaStreamCallbackFlags statusFlags, void *userData); ! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode) { PaError err; int j, devno, pa_indev = -1, pa_outdev = -1; ! pa_callback = schedmode==1 ? process : NULL; ! sys_setscheduler(schedmode); ! /* Initialize PortAudio */ ! err = Pa_Initialize(); ! if (err != paNoError) { ! fprintf(stderr, "Error number %d occured initializing portaudio\n", err); ! fprintf(stderr, "Error message: %s\n", Pa_GetErrorText(err)); ! return 1; } ! /* post("in %d out %d rate %d device %d", inchans, outchans, rate, deviceno); */ ! if ( inchans > MAX_PA_CHANS) {post( "input channels reduced to maximum %d", MAX_PA_CHANS); inchans = MAX_PA_CHANS;} ! if (outchans > MAX_PA_CHANS) {post("output channels reduced to maximum %d", MAX_PA_CHANS); outchans = MAX_PA_CHANS;} ! if (inchans > 0) { ! for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxInputChannels; ! if (maxchans > 0) { ! if (devno == indeviceno) { ! if (maxchans < inchans) inchans = maxchans; pa_indev = j; break; *************** *** 107,123 **** } } ! ! if (outchans > 0) ! { ! for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) ! { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxOutputChannels; ! if (maxchans > 0) ! { ! if (devno == outdeviceno) ! { ! if (maxchans < outchans) ! outchans = maxchans; pa_outdev = j; break; --- 78,88 ---- } } ! if (outchans > 0) { ! for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxOutputChannels; ! if (maxchans > 0) { ! if (devno == outdeviceno) { ! if (maxchans < outchans) outchans = maxchans; pa_outdev = j; break; *************** *** 127,299 **** } } ! ! if (sys_verbose) ! { ! post("input device %d, channels %d", pa_indev, inchans); post("output device %d, channels %d", pa_outdev, outchans); post("latency advance %d", advance); } ! if (inchans || outchans) ! { #ifndef PABLOCKING ! if (schedmode == 1) ! { #endif ! PaStreamParameters inputParameters, outputParameters; ! ! /* initialize input */ ! inputParameters.device = pa_indev ; ! inputParameters.channelCount = inchans; ! inputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! inputParameters.suggestedLatency = advance * 0.001; ! inputParameters.hostApiSpecificStreamInfo = NULL; ! ! /* initialize output */ ! outputParameters.device = pa_outdev; ! outputParameters.channelCount = outchans; ! outputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! outputParameters.suggestedLatency = advance * 0.001; ! outputParameters.hostApiSpecificStreamInfo = NULL; ! ! /* report to portaudio */ ! err = Pa_OpenStream(&pa_stream, ! ( (pa_indev != -1) ? &inputParameters : 0), ! ( (pa_outdev != -1) ? &outputParameters : 0), ! rate, ! sys_dacblocksize, ! paClipOff, /* tb: we should be faster ;-) */ ! pa_callback, NULL); ! ! if (err == paNoError) ! { ! const PaStreamInfo * streaminfo = Pa_GetStreamInfo (pa_stream); ! sys_schedadvance = 1e6 * streaminfo->outputLatency; ! } ! #ifndef PABLOCKING ! } ! else ! { ! int nbuffers = sys_advance_samples / sys_dacblocksize; ! err = PD_OpenAudioStream( &pablio_stream, rate, paFloat32, ! inchans, outchans, sys_dacblocksize, ! nbuffers, pa_indev, pa_outdev); ! } ! #endif } ! else ! err = 0; ! ! if ( err != paNoError ) ! { ! post("Error number %d occured opening portaudio stream\n", ! err); post("Error message: %s\n", Pa_GetErrorText( err ) ); Pa_Terminate(); sys_inchannels = sys_outchannels = 0; ! return (1); ! } ! else if (sys_verbose) ! post("... opened OK."); pa_inchans = inchans; pa_outchans = outchans; - #ifndef PABLOCKING ! if (schedmode) #endif ! err = Pa_StartStream(pa_stream); ! ! if ( err != paNoError ) ! { ! post("Error number %d occured starting portaudio stream\n", ! err); post("Error message: %s\n", Pa_GetErrorText(err)); Pa_Terminate(); sys_inchannels = sys_outchannels = 0; ! return (1); } ! ! post("successfully started"); ! ! return (0); } - void sys_peakmeters(void); extern int sys_meters; /* true if we're metering */ int process (const void *input, void *output, unsigned long frameCount, ! const PaStreamCallbackTimeInfo* timeInfo, ! PaStreamCallbackFlags statusFlags, void *userData) ! { ! int i,j; ! int timeout = (float)frameCount / (float) sys_dacsr * 1e6; ! ! if (sys_timedlock(timeout) == ETIMEDOUT) ! /* we're late */ ! { ! post("timeout %d", timeout); ! sys_log_error(ERR_SYSLOCK); ! return 0; ! } ! for (j = 0; j < sys_inchannels; j++) ! { ! t_sample * in = ((t_sample**)input)[j]; ! copyvec(sys_soundin + j * sys_dacblocksize, ! in, ! sys_dacblocksize); ! } ! ! sched_tick(sys_time + sys_time_per_dsp_tick); ! ! for (j = 0; j < sys_outchannels; j++) ! { ! t_sample * out = ((t_sample**)output)[j]; ! copyvec(out, ! sys_soundout + j * sys_dacblocksize, ! sys_dacblocksize); ! } ! /* update peak meters */ ! if (sys_meters) ! sys_peakmeters(); ! ! /* clear the output buffer */ ! zerovec(sys_soundout, pa_outchans * sys_dacblocksize); ! ! sys_unlock(); ! return 0; } ! void pa_close_audio( void) ! { ! post("closing portaudio"); ! if (pa_inchans || pa_outchans) ! { ! if (pa_stream) ! { ! Pa_StopStream(pa_stream); ! Pa_CloseStream(pa_stream); ! pa_stream = NULL; ! } ! if (pablio_stream) ! { ! PD_CloseAudioStream(pablio_stream); ! pablio_stream = NULL; ! } } ! post("portaudio closed"); pa_inchans = pa_outchans = 0; } - /* for blocked IO */ ! int pa_send_dacs(void) ! { #ifdef PABLOCKING /* tb: blocking IO isn't really working for v19 yet */ double timenow, timebefore; ! ! if ( (pa_inchans && Pa_GetStreamReadAvailable(pa_stream) ! < sys_dacblocksize*0.8) && (pa_outchans && Pa_GetStreamWriteAvailable(pa_stream) < sys_dacblocksize*0.8)) --- 92,209 ---- } } ! if (sys_verbose) { ! post( "input device %d, channels %d", pa_indev, inchans); post("output device %d, channels %d", pa_outdev, outchans); post("latency advance %d", advance); } ! if (inchans || outchans) { #ifndef PABLOCKING ! if (schedmode == 1) { #endif ! PaStreamParameters inputParameters, outputParameters; ! /* initialize input */ ! inputParameters.device = pa_indev ; ! inputParameters.channelCount = inchans; ! inputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! inputParameters.suggestedLatency = advance * 0.001; ! inputParameters.hostApiSpecificStreamInfo = NULL; ! /* initialize output */ ! outputParameters.device = pa_outdev; ! outputParameters.channelCount = outchans; ! outputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! outputParameters.suggestedLatency = advance * 0.001; ! outputParameters.hostApiSpecificStreamInfo = NULL; ! /* report to portaudio */ ! err = Pa_OpenStream(&pa_stream, ! ( pa_indev!=-1 ? &inputParameters : 0), ! (pa_outdev!=-1 ? &outputParameters : 0), ! rate, sys_dacblocksize, paClipOff, /* tb: we should be faster ;-) */ pa_callback, NULL); ! if (err == paNoError) { ! const PaStreamInfo * streaminfo = Pa_GetStreamInfo (pa_stream); ! sys_schedadvance = 1e6 * streaminfo->outputLatency; ! } #ifndef PABLOCKING ! } else { ! int nbuffers = sys_advance_samples / sys_dacblocksize; ! err = PD_OpenAudioStream( &pablio_stream, rate, paFloat32, ! inchans, outchans, sys_dacblocksize, nbuffers, pa_indev, pa_outdev); } ! #endif ! } else err = 0; ! if (err != paNoError) { ! post("Error number %d occured opening portaudio stream\n", err); post("Error message: %s\n", Pa_GetErrorText( err ) ); Pa_Terminate(); sys_inchannels = sys_outchannels = 0; ! return 1; ! } else if (sys_verbose) post("... opened OK."); pa_inchans = inchans; pa_outchans = outchans; #ifndef PABLOCKING ! if (schedmode) #endif ! err = Pa_StartStream(pa_stream); ! if (err != paNoError) { ! post("Error number %d occured starting portaudio stream\n", err); post("Error message: %s\n", Pa_GetErrorText(err)); Pa_Terminate(); sys_inchannels = sys_outchannels = 0; ! return 1; } ! post("successfully started"); ! return 0; } void sys_peakmeters(void); extern int sys_meters; /* true if we're metering */ int process (const void *input, void *output, unsigned long frameCount, ! const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void *userData) { ! int i,j; ! int timeout = (float)frameCount / (float) sys_dacsr * 1e6; ! if (sys_timedlock(timeout) == ETIMEDOUT) /* we're late */ { ! post("timeout %d", timeout); ! sys_log_error(ERR_SYSLOCK); return 0; + } + for (j = 0; j < sys_inchannels; j++) { + t_sample * in = ((t_sample**)input)[j]; + copyvec(sys_soundin + j * sys_dacblocksize,in,sys_dacblocksize); + } + sched_tick(sys_time + sys_time_per_dsp_tick); + for (j = 0; j < sys_outchannels; j++) { + t_sample * out = ((t_sample**)output)[j]; + copyvec(out,sys_soundout + j * sys_dacblocksize,sys_dacblocksize); + } + /* update peak meters */ + if (sys_meters) sys_peakmeters(); + /* clear the output buffer */ + zerovec(sys_soundout, pa_outchans * sys_dacblocksize); + sys_unlock(); + return 0; } ! void pa_close_audio() { ! post("closing portaudio"); ! if (pa_inchans || pa_outchans) { ! if (pa_stream) { ! Pa_StopStream(pa_stream); ! Pa_CloseStream(pa_stream); ! pa_stream = NULL; } ! if (pablio_stream) { ! PD_CloseAudioStream(pablio_stream); ! pablio_stream = NULL; ! } ! } ! post("portaudio closed"); pa_inchans = pa_outchans = 0; } /* for blocked IO */ ! int pa_send_dacs() { #ifdef PABLOCKING /* tb: blocking IO isn't really working for v19 yet */ double timenow, timebefore; ! if ((pa_inchans && Pa_GetStreamReadAvailable(pa_stream) < sys_dacblocksize*0.8) && (pa_outchans && Pa_GetStreamWriteAvailable(pa_stream) < sys_dacblocksize*0.8))

1 0

pd/src s_audio_mmio.c,1.4.4.1.4.2,1.4.4.1.4.3
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27719 Modified Files: Tag: desiredata s_audio_mmio.c Log Message: cleanup and remove fprintf Index: s_audio_mmio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_mmio.c,v retrieving revision 1.4.4.1.4.2 retrieving revision 1.4.4.1.4.3 diff -C2 -d -r1.4.4.1.4.2 -r1.4.4.1.4.3 *** s_audio_mmio.c 10 Jul 2007 05:47:28 -0000 1.4.4.1.4.2 --- s_audio_mmio.c 30 Jul 2007 23:26:40 -0000 1.4.4.1.4.3 *************** *** 53,66 **** static int ntsnd_inphase[NAPORTS]; /* index of next buffer to read */ ! static void nt_waveinerror(char *s, int err) { char t[256]; waveInGetErrorText(err, t, 256); ! fprintf(stderr, s, t); } ! static void nt_waveouterror(char *s, int err) { char t[256]; waveOutGetErrorText(err, t, 256); ! fprintf(stderr, s, t); } --- 53,66 ---- static int ntsnd_inphase[NAPORTS]; /* index of next buffer to read */ ! static void nt_waveinerror(const char *s, int err) { char t[256]; waveInGetErrorText(err, t, 256); ! error(s,t); } ! static void nt_waveouterror(const char *s, int err) { char t[256]; waveOutGetErrorText(err, t, 256); ! error(s,t); } *************** *** 147,153 **** /* Open a waveform device for output in sucessiv device numbering*/ mmresult = waveOutOpen(&ntsnd_outdev[nda], nt_whichdac + nda, (WAVEFORMATEX *)(&form), 0L, 0L, CALLBACK_NULL); ! if (sys_verbose) fprintf(stderr,"opened dac device %d, with return %d\n", nt_whichdac +nda, mmresult); if (mmresult != MMSYSERR_NOERROR) { ! fprintf(stderr,"Wave out open device %d + %d\n",nt_whichdac,nda); nt_waveouterror("waveOutOpen device: %s\n", mmresult); nt_nwaveout = nda; --- 147,153 ---- /* Open a waveform device for output in sucessiv device numbering*/ mmresult = waveOutOpen(&ntsnd_outdev[nda], nt_whichdac + nda, (WAVEFORMATEX *)(&form), 0L, 0L, CALLBACK_NULL); ! if (sys_verbose) post("opened dac device %d, with return %d", nt_whichdac +nda, mmresult); if (mmresult != MMSYSERR_NOERROR) { ! post("Wave out open device %d + %d",nt_whichdac,nda); nt_waveouterror("waveOutOpen device: %s\n", mmresult); nt_nwaveout = nda; *************** *** 246,251 **** phase3 = WRAPFWD(phase2 + 1); } ! post("nad %d phase %d busy %d done %d", nad, phase, firstphasebusy, ! firstphasedone); continue; multipleadc: --- 246,250 ---- phase3 = WRAPFWD(phase2 + 1); } ! post("nad %d phase %d busy %d done %d", nad, phase, firstphasebusy, firstphasedone); continue; multipleadc: *************** *** 276,283 **** phase3 = WRAPFWD(phase2 + 1); } ! if (firstphasebusy < 0) post("nda %d phase %d all %d", ! nda, phase, (ntsnd_outvec[nad][0].lpWaveHdr->dwFlags & WHDR_DONE)); ! else post("nda %d phase %d busy %d done %d", nda, phase, firstphasebusy, ! firstphasedone); continue; multipledac: --- 275,280 ---- phase3 = WRAPFWD(phase2 + 1); } ! if (firstphasebusy < 0) post("nda %d phase %d all %d", nda, phase, (ntsnd_outvec[nad][0].lpWaveHdr->dwFlags & WHDR_DONE)); ! else post("nda %d phase %d busy %d done %d", nda, phase, firstphasebusy, firstphasedone); continue; multipledac: *************** *** 313,324 **** WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; if (!(inwavehdr->dwFlags & WHDR_DONE)) break; ! if (inwavehdr->dwFlags & WHDR_PREPARED) ! waveInUnprepareHeader(ntsnd_indev[nad], ! inwavehdr, sizeof(WAVEHDR)); inwavehdr->dwFlags = 0L; waveInPrepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); mmresult = waveInAddBuffer(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) ! nt_waveinerror("waveInAddBuffer: %s\n", mmresult); ntsnd_inphase[nad] = phase = WRAPFWD(phase + 1); } --- 310,318 ---- WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; if (!(inwavehdr->dwFlags & WHDR_DONE)) break; ! if (inwavehdr->dwFlags & WHDR_PREPARED) waveInUnprepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); inwavehdr->dwFlags = 0L; waveInPrepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); mmresult = waveInAddBuffer(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) nt_waveinerror("waveInAddBuffer: %s\n", mmresult); ntsnd_inphase[nad] = phase = WRAPFWD(phase + 1); } *************** *** 331,345 **** WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; if (!(outwavehdr->dwFlags & WHDR_DONE)) break; ! if (outwavehdr->dwFlags & WHDR_PREPARED) ! waveOutUnprepareHeader(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); outwavehdr->dwFlags = 0L; ! memset((char *)(ntsnd_outvec[nda][phase].lpData), ! 0, (CHANNELS_PER_DEVICE * SAMPSIZE * nt_realdacblksize)); ! waveOutPrepareHeader(ntsnd_outdev[nda], outwavehdr, ! sizeof(WAVEHDR)); ! mmresult = waveOutWrite(ntsnd_outdev[nda], outwavehdr, ! sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) ! nt_waveouterror("waveOutAddBuffer: %s\n", mmresult); ntsnd_outphase[nda] = phase = WRAPFWD(phase + 1); } --- 325,334 ---- WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; if (!(outwavehdr->dwFlags & WHDR_DONE)) break; ! if (outwavehdr->dwFlags & WHDR_PREPARED) waveOutUnprepareHeader(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); outwavehdr->dwFlags = 0L; ! memset((char *)(ntsnd_outvec[nda][phase].lpData), 0, (CHANNELS_PER_DEVICE * SAMPSIZE * nt_realdacblksize)); ! waveOutPrepareHeader( ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); ! mmresult = waveOutWrite(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) nt_waveouterror("waveOutAddBuffer: %s\n", mmresult); ntsnd_outphase[nda] = phase = WRAPFWD(phase + 1); } *************** *** 385,389 **** float *fp1, *fp2; int nextfill, doxfer = 0; - int nda, nad; if (!nt_nwavein && !nt_nwaveout) return 0; if (nt_meters) { --- 374,377 ---- *************** *** 406,434 **** first check whether the buffers are marked "done". */ if (!nt_fill) { ! for (nad = 0; nad < nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; if (!(inwavehdr->dwFlags & WHDR_DONE)) goto idle; } ! for (nda = 0; nda < nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; if (!(outwavehdr->dwFlags & WHDR_DONE)) goto idle; } ! for (nad = 0; nad < nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; ! if (inwavehdr->dwFlags & WHDR_PREPARED) ! waveInUnprepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); } ! for (nda = 0; nda < nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; ! if (outwavehdr->dwFlags & WHDR_PREPARED) ! waveOutUnprepareHeader(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); } } /* Convert audio output to fixed-point and put it in the output buffer. */ ! for (nda = 0, fp1 = sys_soundout; nda < nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; for (i=0, sp1=(short *)(ntsnd_outvec[nda][phase].lpData)+CHANNELS_PER_DEVICE*nt_fill; i<2; i++, fp1 += sys_dacblocksize, sp1++) { --- 394,421 ---- first check whether the buffers are marked "done". */ if (!nt_fill) { ! for (int nad=0; nad<nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; if (!(inwavehdr->dwFlags & WHDR_DONE)) goto idle; } ! for (int nda=0; nda<nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; if (!(outwavehdr->dwFlags & WHDR_DONE)) goto idle; } ! for (int nad=0; nad<nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; ! if (inwavehdr->dwFlags & WHDR_PREPARED) waveInUnprepareHeader(ntsnd_indev[nad], inwavehdr, sizeof(WAVEHDR)); } ! for (int nda=0; nda<nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; ! if (outwavehdr->dwFlags & WHDR_PREPARED) waveOutUnprepareHeader(ntsnd_outdev[nda], outwavehdr, sizeof(WAVEHDR)); } } /* Convert audio output to fixed-point and put it in the output buffer. */ ! fp1 = sys_soundout; ! for (int nda=0; nda<nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; for (i=0, sp1=(short *)(ntsnd_outvec[nda][phase].lpData)+CHANNELS_PER_DEVICE*nt_fill; i<2; i++, fp1 += sys_dacblocksize, sp1++) { *************** *** 443,447 **** memset(sys_soundout, 0, (sys_dacblocksize *sizeof(t_sample)*CHANNELS_PER_DEVICE)*nt_nwaveout); /* vice versa for the input buffer */ ! for (nad = 0, fp1 = sys_soundin; nad < nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; for (i=0, sp1=(short *)(ntsnd_invec[nad][phase].lpData)+CHANNELS_PER_DEVICE*nt_fill; i < 2; i++, fp1 += sys_dacblocksize, sp1++) { --- 430,435 ---- memset(sys_soundout, 0, (sys_dacblocksize *sizeof(t_sample)*CHANNELS_PER_DEVICE)*nt_nwaveout); /* vice versa for the input buffer */ ! fp1 = sys_soundin; ! for (int nad=0; nad<nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; for (i=0, sp1=(short *)(ntsnd_invec[nad][phase].lpData)+CHANNELS_PER_DEVICE*nt_fill; i < 2; i++, fp1 += sys_dacblocksize, sp1++) { *************** *** 454,458 **** if (nt_fill == nt_realdacblksize) { nt_fill = 0; ! for (nad = 0; nad < nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; HWAVEIN device = ntsnd_indev[nad]; --- 442,446 ---- if (nt_fill == nt_realdacblksize) { nt_fill = 0; ! for (int nad=0; nad<nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; HWAVEIN device = ntsnd_indev[nad]; *************** *** 460,468 **** waveInPrepareHeader(device, inwavehdr, sizeof(WAVEHDR)); mmresult = waveInAddBuffer(device, inwavehdr, sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) ! nt_waveinerror("waveInAddBuffer: %s\n", mmresult); ntsnd_inphase[nad] = WRAPFWD(phase + 1); } ! for (nda = 0; nda < nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; HWAVEOUT device = ntsnd_outdev[nda]; --- 448,455 ---- waveInPrepareHeader(device, inwavehdr, sizeof(WAVEHDR)); mmresult = waveInAddBuffer(device, inwavehdr, sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) nt_waveinerror("waveInAddBuffer: %s\n", mmresult); ntsnd_inphase[nad] = WRAPFWD(phase + 1); } ! for (int nda=0; nda<nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; HWAVEOUT device = ntsnd_outdev[nda]; *************** *** 470,484 **** waveOutPrepareHeader(device, outwavehdr, sizeof(WAVEHDR)); mmresult = waveOutWrite(device, outwavehdr, sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) ! nt_waveouterror("waveOutWrite: %s\n", mmresult); ntsnd_outphase[nda] = WRAPFWD(phase + 1); } /* check for DAC underflow or ADC overflow. */ ! for (nad = 0; nad < nt_nwavein; nad++) { int phase = WRAPBACK(ntsnd_inphase[nad] - 2); WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; if (inwavehdr->dwFlags & WHDR_DONE) goto late; } ! for (nda = 0; nda < nt_nwaveout; nda++) { int phase = WRAPBACK(ntsnd_outphase[nda] - 2); WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; --- 457,470 ---- waveOutPrepareHeader(device, outwavehdr, sizeof(WAVEHDR)); mmresult = waveOutWrite(device, outwavehdr, sizeof(WAVEHDR)); ! if (mmresult != MMSYSERR_NOERROR) nt_waveouterror("waveOutWrite: %s\n", mmresult); ntsnd_outphase[nda] = WRAPFWD(phase + 1); } /* check for DAC underflow or ADC overflow. */ ! for (int nad=0; nad<nt_nwavein; nad++) { int phase = WRAPBACK(ntsnd_inphase[nad] - 2); WAVEHDR *inwavehdr = ntsnd_invec[nad][phase].lpWaveHdr; if (inwavehdr->dwFlags & WHDR_DONE) goto late; } ! for (int nda=0; nda<nt_nwaveout; nda++) { int phase = WRAPBACK(ntsnd_outphase[nda] - 2); WAVEHDR *outwavehdr = ntsnd_outvec[nda][phase].lpWaveHdr; *************** *** 493,514 **** idle: /* If more than nt_adcjitterbufsallowed ADC buffers are ready on any input device, resynchronize */ ! for (nad = 0; nad < nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; WAVEHDR *inwavehdr = ntsnd_invec[nad][WRAPFWD(phase + nt_adcjitterbufsallowed)].lpWaveHdr; ! if (inwavehdr->dwFlags & WHDR_DONE) { ! nt_resyncaudio(); ! return 0; ! } } /* test dac sync the same way */ ! for (nda = 0; nda < nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; ! WAVEHDR *outwavehdr = ! ntsnd_outvec[nda] ! [WRAPFWD(phase + nt_dacjitterbufsallowed)].lpWaveHdr; ! if (outwavehdr->dwFlags & WHDR_DONE) { ! nt_resyncaudio(); ! return 0; ! } } #ifdef MIDI_TIMESTAMP --- 479,492 ---- idle: /* If more than nt_adcjitterbufsallowed ADC buffers are ready on any input device, resynchronize */ ! for (int nad=0; nad<nt_nwavein; nad++) { int phase = ntsnd_inphase[nad]; WAVEHDR *inwavehdr = ntsnd_invec[nad][WRAPFWD(phase + nt_adcjitterbufsallowed)].lpWaveHdr; ! if ( inwavehdr->dwFlags & WHDR_DONE) {nt_resyncaudio(); return 0;} } /* test dac sync the same way */ ! for (int nda=0; nda<nt_nwaveout; nda++) { int phase = ntsnd_outphase[nda]; ! WAVEHDR *outwavehdr = ntsnd_outvec[nda][WRAPFWD(phase + nt_dacjitterbufsallowed)].lpWaveHdr; ! if (outwavehdr->dwFlags & WHDR_DONE) {nt_resyncaudio(); return 0;} } #ifdef MIDI_TIMESTAMP *************** *** 527,536 **** nbuf = sys_advance_samples/nt_realdacblksize; if (nbuf >= MAXBUFFER) { ! fprintf(stderr, "pd: audio buffering maxed out to %d\n", ! (int)(MAXBUFFER * ((nt_realdacblksize * 1000.)/44100.))); nbuf = MAXBUFFER; } else if (nbuf < 4) nbuf = 4; ! fprintf(stderr, "%d audio buffers\n", nbuf); nt_naudiobuffer = nbuf; if (nt_adcjitterbufsallowed > nbuf - 2) nt_adcjitterbufsallowed = nbuf - 2; --- 505,513 ---- nbuf = sys_advance_samples/nt_realdacblksize; if (nbuf >= MAXBUFFER) { ! post("pd: audio buffering maxed out to %d", (int)(MAXBUFFER * ((nt_realdacblksize * 1000.)/44100.))); nbuf = MAXBUFFER; } else if (nbuf < 4) nbuf = 4; ! post("%d audio buffers", nbuf); nt_naudiobuffer = nbuf; if (nt_adcjitterbufsallowed > nbuf - 2) nt_adcjitterbufsallowed = nbuf - 2; *************** *** 554,558 **** wRtn = waveInGetDevCaps(i, (LPWAVEINCAPS) &wicap, sizeof(wicap)); if (wRtn) nt_waveinerror("waveInGetDevCaps: %s\n", wRtn); ! else fprintf(stderr, "audio input device #%d: %s\n", i+1, wicap.szPname); } ndevices = waveOutGetNumDevs(); --- 531,535 ---- wRtn = waveInGetDevCaps(i, (LPWAVEINCAPS) &wicap, sizeof(wicap)); if (wRtn) nt_waveinerror("waveInGetDevCaps: %s\n", wRtn); ! else post("audio input device #%d: %s", i+1, wicap.szPname); } ndevices = waveOutGetNumDevs(); *************** *** 561,565 **** wRtn = waveOutGetDevCaps(i, (LPWAVEOUTCAPS) &wocap, sizeof(wocap)); if (wRtn) nt_waveouterror("waveOutGetDevCaps: %s\n", wRtn); ! else fprintf(stderr, "audio output device #%d: %s\n", i+1, wocap.szPname); } } --- 538,542 ---- wRtn = waveOutGetDevCaps(i, (LPWAVEOUTCAPS) &wocap, sizeof(wocap)); if (wRtn) nt_waveouterror("waveOutGetDevCaps: %s\n", wRtn); ! else post("audio output device #%d: %s", i+1, wocap.szPname); } }

1 0

externals/hcs/usbhid/test - New directory
by Hans-Christoph Steiner 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/externals/hcs/usbhid/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27367/test Log Message: Directory /cvsroot/pure-data/externals/hcs/usbhid/test added to the repository

1 0

pd/src s_audio_oss.c,1.6.4.2.2.2.2.7,1.6.4.2.2.2.2.8
by Mathieu Bouchard 31 Jul '07

31 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15995 Modified Files: Tag: desiredata s_audio_oss.c Log Message: removed fprintf Index: s_audio_oss.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_oss.c,v retrieving revision 1.6.4.2.2.2.2.7 retrieving revision 1.6.4.2.2.2.2.8 diff -C2 -d -r1.6.4.2.2.2.2.7 -r1.6.4.2.2.2.2.8 *** s_audio_oss.c 10 Jul 2007 07:04:55 -0000 1.6.4.2.2.2.2.7 --- s_audio_oss.c 30 Jul 2007 22:55:24 -0000 1.6.4.2.2.2.2.8 *************** *** 132,145 **** if (sys_verbose) post("bytes per sample = %d", dev->bytespersamp); ! if (ioctl(fd, SNDCTL_DSP_SETFMT, &param) == -1) ! fprintf(stderr,"OSS: Could not set DSP format\n"); ! else if (wantformat != param) ! fprintf(stderr,"OSS: DSP format: wanted %d, got %d\n", wantformat, param); /* sample rate */ orig = param = srate; ! if (ioctl(fd, SNDCTL_DSP_SPEED, &param) == -1) ! fprintf(stderr,"OSS: Could not set sampling rate for device\n"); ! else if( orig != param ) ! fprintf(stderr,"OSS: sampling rate: wanted %d, got %d\n", orig, param ); if (oss_blockmode && !skipblocksize) { --- 132,141 ---- if (sys_verbose) post("bytes per sample = %d", dev->bytespersamp); ! if (ioctl(fd, SNDCTL_DSP_SETFMT, &param) == -1) error("OSS: Could not set DSP format"); ! else if (wantformat != param) error("OSS: DSP format: wanted %d, got %d", wantformat, param); /* sample rate */ orig = param = srate; ! if (ioctl(fd, SNDCTL_DSP_SPEED, &param) == -1) error("OSS: Could not set sampling rate for device"); ! else if (orig != param) error("OSS: sampling rate: wanted %d, got %d", orig, param ); if (oss_blockmode && !skipblocksize) { *************** *** 180,184 **** out. */ int defect; ! if (ioctl(fd, SOUND_PCM_GETOSPACE,&ainfo) < 0) fprintf(stderr,"OSS: ioctl on output device failed"); dev->bufsize = ainfo.bytes; defect = sys_advance_samples * (dev->bytespersamp * nchannels) --- 176,180 ---- out. */ int defect; ! if (ioctl(fd, SOUND_PCM_GETOSPACE,&ainfo) < 0) error("OSS: ioctl on output device failed"); dev->bufsize = ainfo.bytes; defect = sys_advance_samples * (dev->bytespersamp * nchannels) *************** *** 186,190 **** if (defect > 0) { if (sys_verbose || defect > (dev->bufsize >> 2)) ! fprintf(stderr, "OSS: requested audio buffer size %d limited to %d\n", sys_advance_samples * (dev->bytespersamp * nchannels), dev->bufsize); sys_advance_samples = (dev->bufsize-OSS_XFERSAMPS(nchannels)) / (dev->bytespersamp*nchannels); --- 182,186 ---- if (defect > 0) { if (sys_verbose || defect > (dev->bufsize >> 2)) ! error("OSS: requested audio buffer size %d limited to %d", sys_advance_samples * (dev->bytespersamp * nchannels), dev->bufsize); sys_advance_samples = (dev->bufsize-OSS_XFERSAMPS(nchannels)) / (dev->bytespersamp*nchannels); *************** *** 326,332 **** will not block. But I wonder why we only have to read from one of the devices and not all of them??? */ if (linux_nindevs) { ! if (sys_verbose) fprintf(stderr,("OSS: issuing first ADC 'read' ... ")); read(linux_adcs[0].fd, buf, linux_adcs[0].bytespersamp * linux_adcs[0].nchannels * sys_dacblocksize); ! if (sys_verbose) fprintf(stderr, "...done.\n"); } /* now go and fill all the output buffers. */ --- 322,328 ---- will not block. But I wonder why we only have to read from one of the devices and not all of them??? */ if (linux_nindevs) { ! if (sys_verbose) post("OSS: issuing first ADC 'read'..."); read(linux_adcs[0].fd, buf, linux_adcs[0].bytespersamp * linux_adcs[0].nchannels * sys_dacblocksize); ! if (sys_verbose) post("...done."); } /* now go and fill all the output buffers. */ *************** *** 357,366 **** for (int dev=0; dev<linux_noutdevs; dev++) { if (ioctl(linux_dacs[dev].fd, SOUND_PCM_GETOSPACE,&ainfo) < 0) ! fprintf(stderr,"OSS: ioctl on output device %d failed",dev); linux_dacs[dev].space = ainfo.bytes; } for (int dev=0; dev<linux_nindevs; dev++) { if (ioctl(linux_adcs[dev].fd, SOUND_PCM_GETISPACE,&ainfo) < 0) ! fprintf(stderr, "OSS: ioctl on input device %d, fd %d failed", dev, linux_adcs[dev].fd); linux_adcs[dev].space = ainfo.bytes; } --- 353,362 ---- for (int dev=0; dev<linux_noutdevs; dev++) { if (ioctl(linux_dacs[dev].fd, SOUND_PCM_GETOSPACE,&ainfo) < 0) ! error("OSS: ioctl on output device %d failed",dev); linux_dacs[dev].space = ainfo.bytes; } for (int dev=0; dev<linux_nindevs; dev++) { if (ioctl(linux_adcs[dev].fd, SOUND_PCM_GETISPACE,&ainfo) < 0) ! error("OSS: ioctl on input device %d, fd %d failed", dev, linux_adcs[dev].fd); linux_adcs[dev].space = ainfo.bytes; } *************** *** 370,375 **** if (!oss_blockmode) { oss_calcspace(); ! for (int dev=0; dev < linux_noutdevs; dev++) fprintf(stderr, "dac %d space %d\n", dev, linux_dacs[dev].space); ! for (int dev=0; dev < linux_nindevs; dev++) fprintf(stderr, "adc %d space %d\n", dev, linux_adcs[dev].space); } } --- 366,371 ---- if (!oss_blockmode) { oss_calcspace(); ! for (int dev=0; dev < linux_noutdevs; dev++) post("dac %d space %d", dev, linux_dacs[dev].space); ! for (int dev=0; dev < linux_nindevs; dev++) post("adc %d space %d", dev, linux_adcs[dev].space); } } *************** *** 389,396 **** } else while (d.space > OSS_XFERSIZE(d.nchannels, d.bytespersamp)) { linux_adcs_read(d.fd, buf, OSS_XFERSIZE(d.nchannels, d.bytespersamp)); ! if (ioctl(d.fd, SOUND_PCM_GETISPACE, &ainfo) < 0) { ! fprintf(stderr, "OSS: ioctl on input device %d, fd %d failed", dev, d.fd); ! break; ! } d.space = ainfo.bytes; } --- 385,389 ---- } else while (d.space > OSS_XFERSIZE(d.nchannels, d.bytespersamp)) { linux_adcs_read(d.fd, buf, OSS_XFERSIZE(d.nchannels, d.bytespersamp)); ! if (ioctl(d.fd, SOUND_PCM_GETISPACE, &ainfo) < 0) { error("OSS: ioctl on input device %d, fd %d failed",dev,d.fd); break;} d.space = ainfo.bytes; } *************** *** 405,412 **** } linux_dacs_write(d.fd, buf, OSS_XFERSIZE(d.nchannels, d.bytespersamp)); ! if (ioctl(d.fd, SOUND_PCM_GETOSPACE, &ainfo) < 0) { ! fprintf(stderr, "OSS: ioctl on output device %d, fd %d failed", dev, d.fd); ! break; ! } d.space = ainfo.bytes; } --- 398,402 ---- } linux_dacs_write(d.fd, buf, OSS_XFERSIZE(d.nchannels, d.bytespersamp)); ! if (ioctl(d.fd, SOUND_PCM_GETOSPACE, &ainfo) < 0) {error("OSS: ioctl on output device %d, fd %d failed",dev,d.fd); break;} d.space = ainfo.bytes; }

1 0

← Newer
1
2
3
4
5
6
7
...
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