Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv30545
Modified Files: Tag: devel_0_37 s_audio_jack.c Log Message: remove sys_error_log from process callback
Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** s_audio_jack.c 7 Oct 2003 14:31:45 -0000 1.1.2.5 --- s_audio_jack.c 21 Jan 2004 19:53:36 -0000 1.1.2.6 *************** *** 29,32 **** --- 29,34 ---- static jack_client_t *jack_client = NULL; char *jack_client_names[MAX_CLIENTS]; + static int jack_dio_error; +
pthread_mutex_t jack_mutex; *************** *** 57,61 **** jack_filled -= nframes; } else { /* PD could not keep up ! */ ! if (jack_started) sys_log_error(ERR_RESYNC); for (j = 0; j < outport_count; j++) { out = jack_port_get_buffer (output_port[j], nframes); --- 59,63 ---- jack_filled -= nframes; } else { /* PD could not keep up ! */ ! if (jack_started) jack_dio_error = 1; for (j = 0; j < outport_count; j++) { out = jack_port_get_buffer (output_port[j], nframes); *************** *** 208,211 **** --- 210,215 ---- int srate;
+ jack_dio_error = 0; + if ((inchans == 0) && (outchans == 0)) return 0;
*************** *** 327,330 **** --- 331,338 ---- if (!sys_inchannels && !sys_outchannels) return (SENDDACS_NO);
+ if (jack_dio_error) { + sys_log_error(ERR_RESYNC); + jack_dio_error = 0; + } if (jack_filled >= jack_out_max) pthread_cond_wait(&jack_sem,&jack_mutex);