Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21799

Modified Files: Tag: desiredata m_pd.h m_fifo.c m_sched.c Removed Files: Tag: desiredata m_fifo.h Log Message: merge m_fifo.h into m_pd.h

--- m_fifo.h DELETED ---

Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.45 retrieving revision 1.4.4.11.2.33.2.46 diff -C2 -d -r1.4.4.11.2.33.2.45 -r1.4.4.11.2.33.2.46 *** m_pd.h 16 Jan 2007 05:13:47 -0000 1.4.4.11.2.33.2.45 --- m_pd.h 28 Jun 2007 06:30:15 -0000 1.4.4.11.2.33.2.46 *************** *** 813,816 **** --- 813,825 ---- EXTERN void testaddvec(t_float *dst,const t_float *src,int n);

+ /* tb's fifos */ + typedef struct _fifo t_fifo; + /* function prototypes */ + EXTERN t_fifo * fifo_init(void); + EXTERN void fifo_destroy(t_fifo*); + /* fifo_put() and fifo_get are the only threadsafe functions!!! */ + EXTERN void fifo_put(t_fifo*, void*); + EXTERN void* fifo_get(t_fifo*); + #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) }

Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.14.2.6.2.2 retrieving revision 1.1.2.14.2.6.2.3 diff -C2 -d -r1.1.2.14.2.6.2.2 -r1.1.2.14.2.6.2.3 *** m_fifo.c 9 Jan 2007 17:09:44 -0000 1.1.2.14.2.6.2.2 --- m_fifo.c 28 Jun 2007 06:30:15 -0000 1.1.2.14.2.6.2.3 *************** *** 8,12 **** #include <stdlib.h> #include "m_pd.h" - #include "m_fifo.h"

#ifndef LOCKFREE --- 8,11 ----

Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.21.2.6 retrieving revision 1.5.4.35.2.21.2.7 diff -C2 -d -r1.5.4.35.2.21.2.6 -r1.5.4.35.2.21.2.7 *** m_sched.c 28 Jun 2007 05:56:41 -0000 1.5.4.35.2.21.2.6 --- m_sched.c 28 Jun 2007 06:30:15 -0000 1.5.4.35.2.21.2.7 *************** *** 6,10 ****

#include "desire.h" - #include "m_fifo.h" #include <stdlib.h>

--- 6,9 ---- *************** *** 27,31 ****

/* T.Grill - enable PD global thread locking - sys_lock, sys_unlock, sys_trylock functions */ ! #define THREAD_LOCKING #include "pthread.h" #include "time.h" --- 26,30 ----

/* T.Grill - enable PD global thread locking - sys_lock, sys_unlock, sys_trylock functions */ ! #define THREAD_LOCKING #include "pthread.h" #include "time.h" *************** *** 108,114 **** This was previously, incorrectly named "clock_getsystime"; the old name is aliased to the new one in m_pd.h. */ ! double clock_getlogicaltime( void) { ! return sys_time; ! }

/* OBSOLETE NAME */ --- 107,111 ---- This was previously, incorrectly named "clock_getsystime"; the old name is aliased to the new one in m_pd.h. */ ! double clock_getlogicaltime () {return sys_time;}

/* OBSOLETE NAME */ *************** *** 237,241 **** static int sched_lastinclip, sched_lastoutclip, sched_lastindb, sched_lastoutdb;

! static void sched_pollformeters( void) { int inclip, outclip, indb, outdb; static int sched_nextmeterpolltime, sched_nextpingtime; --- 234,238 ---- static int sched_lastinclip, sched_lastoutclip, sched_lastindb, sched_lastoutdb;

! static void sched_pollformeters () { int inclip, outclip, indb, outdb; static int sched_nextmeterpolltime, sched_nextpingtime; *************** *** 347,352 **** */

! void sys_pollmidiqueue( void); ! void sys_initmidiqueue( void);

int m_scheduler () { --- 344,349 ---- */

! void sys_pollmidiqueue (); ! void sys_initmidiqueue ();

int m_scheduler () {