Update of /cvsroot/pure-data/externals/pdp/puredata In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/puredata
Modified Files: pdp_comm.c pdp_queue.c Log Message: pdp current darcs merge
Index: pdp_comm.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/puredata/pdp_comm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_comm.c 16 Dec 2005 01:05:36 -0000 1.3 --- pdp_comm.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 117,126 **** --- 117,130 ---- pdp_packet_pass_if_valid(t_outlet *outlet, int *packet_ptr) { + + t_pdp *header = pdp_packet_header(*packet_ptr); if (header){
+ /* send register phase */ outlet_pdp_register(outlet, *packet_ptr);
+ /* unregister */ pdp_packet_mark_unused(*packet_ptr); *************** *** 130,134 **** --- 134,140 ---- outlet_pdp_process(outlet);
+ } + }
*************** *** 318,322 **** }
!
/* some "accelerated" pd symbols */ --- 324,328 ---- }
! #if PDP_SYMBOL_HACK
/* some "accelerated" pd symbols */ *************** *** 330,333 **** --- 336,341 ---- t_symbol s_chanmask = {"chanmask", 0, 0};
+ + // internal pd method t_symbol *dogensym(char *s, t_symbol *oldsym); *************** *** 346,349 **** --- 354,358 ---- }
+ void pdp_pdsym_setup(void) *************** *** 361,364 **** --- 370,379 ---- }
+ #else + + void pdp_pdsym_setup(void){ + } + + #endif
Index: pdp_queue.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/puredata/pdp_queue.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_queue.c 16 Dec 2005 01:05:36 -0000 1.3 --- pdp_queue.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 80,87 ****
} ! void pdp_procqueue_finish(t_pdp_procqueue *q, int index) {
! if (-1 == index) { //post("pdp_pq_remove: index == -1"); return; --- 80,87 ----
} ! void pdp_procqueue_finish(t_pdp_procqueue *q, int indx) {
! if (-1 == indx) { //post("pdp_pq_remove: index == -1"); return; *************** *** 91,96 ****
/* invalidate callback at index */ ! q->q[index & q->mask].x_callback = 0; ! q->q[index & q->mask].x_queue_id = 0;
} --- 91,96 ----
/* invalidate callback at index */ ! q->q[indx & q->mask].x_callback = 0; ! q->q[indx & q->mask].x_queue_id = 0;
} *************** *** 365,369 **** /* default pdp queue shortcut methods */ void pdp_queue_wait() {pdp_procqueue_wait(&pdp_queue);} ! void pdp_queue_finish(int index) { pdp_procqueue_finish(&pdp_queue, index);} void pdp_queue_add(void *owner, void *process, void *callback, int *queue_id) { pdp_procqueue_add(&pdp_queue, owner, process, callback, queue_id); --- 365,369 ---- /* default pdp queue shortcut methods */ void pdp_queue_wait() {pdp_procqueue_wait(&pdp_queue);} ! void pdp_queue_finish(int indx) { pdp_procqueue_finish(&pdp_queue, indx);} void pdp_queue_add(void *owner, void *process, void *callback, int *queue_id) { pdp_procqueue_add(&pdp_queue, owner, process, callback, queue_id);