Pd-cvs June 2007

pd-cvs@lists.iem.at

17 participants
220 discussions

pd/src m_pd.h, 1.4.4.11.2.33.2.45, 1.4.4.11.2.33.2.46 m_fifo.c, 1.1.2.14.2.6.2.2, 1.1.2.14.2.6.2.3 m_sched.c, 1.5.4.35.2.21.2.6, 1.5.4.35.2.21.2.7 m_fifo.h, 1.1.2.3.2.1.2.2, NONE
by Mathieu Bouchard 28 Jun '07

28 Jun '07

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 () {

1 0

pd/src s_stuff.h,1.5.4.10.2.8.2.7,1.5.4.10.2.8.2.8
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18736 Modified Files: Tag: desiredata s_stuff.h Log Message: cleanup Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.10.2.8.2.7 retrieving revision 1.5.4.10.2.8.2.8 diff -C2 -d -r1.5.4.10.2.8.2.7 -r1.5.4.10.2.8.2.8 *** s_stuff.h 3 Jan 2007 07:31:58 -0000 1.5.4.10.2.8.2.7 --- s_stuff.h 28 Jun 2007 06:22:08 -0000 1.5.4.10.2.8.2.8 *************** *** 67,71 **** #define SENDDACS_NO 0 /* return values for sys_send_dacs() */ ! #define SENDDACS_YES 1 #define SENDDACS_SLEPT 2 --- 67,71 ---- #define SENDDACS_NO 0 /* return values for sys_send_dacs() */ ! #define SENDDACS_YES 1 #define SENDDACS_SLEPT 2 *************** *** 84,92 **** extern int sys_sleepgrain; extern int sys_callbackscheduler; /* tb: scheduler to use (0: traditional, 1: callback) */ ! void sys_open_audio(int naudioindev, int *audioindev, ! int nchindev, int *chindev, ! int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, ! int srate, int dacblocksize, int advance, int schedmode, int enable); ! void sys_reopen_audio( void); void sys_close_audio(void); --- 84,92 ---- extern int sys_sleepgrain; extern int sys_callbackscheduler; /* tb: scheduler to use (0: traditional, 1: callback) */ ! void sys_open_audio( ! int naudioindev, int * audioindev, int nchindev, int * chindev, ! int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, ! int srate, int dacblocksize, int advance, int schedmode, int enable); ! void sys_reopen_audio(void); void sys_close_audio(void); *************** *** 112,122 **** extern int sys_midioutdevlist[]; ! void sys_open_midi(int nmidiin, int *midiinvec, ! int nmidiout, int *midioutvec, int enable); ! void sys_get_midi_params(int *pnmidiindev, int *pmidiindev, ! int *pnmidioutdev, int *pmidioutdev); ! void sys_get_midi_apis(char *buf); - void sys_reopen_midi( void); void sys_close_midi( void); --- 112,118 ---- extern int sys_midioutdevlist[]; ! void sys_open_midi(int nmidiin, int *midiinvec, int nmidiout, int *midioutvec, int enable); ! void sys_get_midi_params(int *pnmidiindev, int *pmidiindev, int *pnmidioutdev, int *pmidioutdev); void sys_get_midi_apis(char *buf); void sys_reopen_midi( void); void sys_close_midi( void); *************** *** 127,135 **** EXTERN void sys_midibytein(int portno, int byte); ! /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */ ! void midi_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int maxndev, int devdescsize); ! void sys_do_open_midi(int nmidiindev, int *midiindev, ! int nmidioutdev, int *midioutdev); #ifdef USEAPI_ALSA --- 123,129 ---- EXTERN void sys_midibytein(int portno, int byte); ! /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */ ! void midi_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int maxndev, int devdescsize); ! void sys_do_open_midi(int nmidiindev, int *midiindev, int nmidioutdev, int *midioutdev); #ifdef USEAPI_ALSA *************** *** 141,150 **** EXTERN void sys_alsa_close_midi( void); ! ! /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */ ! void midi_alsa_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int maxndev, int devdescsize); ! void sys_alsa_do_open_midi(int nmidiindev, int *midiindev, ! int nmidioutdev, int *midioutdev); #endif --- 135,141 ---- EXTERN void sys_alsa_close_midi( void); ! /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */ ! void midi_alsa_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int maxndev, int devdescsize); ! void sys_alsa_do_open_midi(int nmidiindev, int *midiindev, int nmidioutdev, int *midioutdev); #endif *************** *** 165,171 **** /* tb } */ - /* s_inter.c */ - EXTERN void sys_microsleep(int microsec); EXTERN void sys_bail(int exitcode); --- 156,160 ---- *************** *** 254,258 **** #endif ! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode); void pa_close_audio(void); --- 243,247 ---- #endif ! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode); void pa_close_audio(void); *************** *** 276,282 **** int oss_send_dacs(void); void oss_reportidle(void); ! void oss_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int *canmulti, ! int maxndev, int devdescsize); int alsa_open_audio(int naudioindev, int *audioindev, int nchindev, --- 265,269 ---- int oss_send_dacs(void); void oss_reportidle(void); ! void oss_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); int alsa_open_audio(int naudioindev, int *audioindev, int nchindev, *************** *** 286,292 **** int alsa_send_dacs(void); void alsa_reportidle(void); ! void alsa_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int *canmulti, ! int maxndev, int devdescsize); int jack_open_audio(int wantinchans, int wantoutchans, int srate, int scheduler); --- 273,277 ---- int alsa_send_dacs(void); void alsa_reportidle(void); ! void alsa_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); int jack_open_audio(int wantinchans, int wantoutchans, int srate, int scheduler); *************** *** 294,300 **** int jack_send_dacs(void); void jack_reportidle(void); ! void jack_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int *canmulti, ! int maxndev, int devdescsize); void jack_listdevs(void); --- 279,283 ---- int jack_send_dacs(void); void jack_reportidle(void); ! void jack_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); void jack_listdevs(void); *************** *** 305,311 **** void mmio_reportidle(void); int mmio_send_dacs(void); ! void mmio_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int *canmulti, ! int maxndev, int devdescsize); void asio_open_audio(int naudioindev, int *audioindev, int nchindev, --- 288,292 ---- void mmio_reportidle(void); int mmio_send_dacs(void); ! void mmio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); void asio_open_audio(int naudioindev, int *audioindev, int nchindev, *************** *** 313,318 **** int nchoutdev, int *choutdev, int srate, int scheduler); void asio_close_audio(void); ! void asio_getdevs(char *indevlist, int *nindevs, char *outdevlist, ! int *noutdevs, int *canmulti, int maxndev, int devdescsize); int asio_send_dacs(void); --- 294,298 ---- int nchoutdev, int *choutdev, int srate, int scheduler); void asio_close_audio(void); ! void asio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize); int asio_send_dacs(void);

1 0

pd/src s_audio.c, 1.5.4.16.2.20.2.7, 1.5.4.16.2.20.2.8 s_inter.c, 1.5.4.10.2.25.2.17, 1.5.4.10.2.25.2.18 s_midi.c, 1.4.4.1.2.12.2.6, 1.4.4.1.2.12.2.7
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18573 Modified Files: Tag: desiredata s_audio.c s_inter.c s_midi.c Log Message: cleanup Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.17 retrieving revision 1.5.4.10.2.25.2.18 diff -C2 -d -r1.5.4.10.2.25.2.17 -r1.5.4.10.2.25.2.18 *** s_inter.c 28 Jun 2007 05:53:58 -0000 1.5.4.10.2.25.2.17 --- s_inter.c 28 Jun 2007 06:21:23 -0000 1.5.4.10.2.25.2.18 *************** *** 30,36 **** #include <winsock.h> #include <windows.h> ! # ifdef _MSC_VER typedef int pid_t; ! # endif typedef int socklen_t; #define EADDRINUSE WSAEADDRINUSE --- 30,36 ---- #include <winsock.h> #include <windows.h> ! #ifdef _MSC_VER typedef int pid_t; ! #endif typedef int socklen_t; #define EADDRINUSE WSAEADDRINUSE *************** *** 129,138 **** gettimeofday(&now, 0); if (then.tv_sec == 0 && then.tv_usec == 0) then = now; ! return ((now.tv_sec - then.tv_sec) + (1./1000000.) * (now.tv_usec - then.tv_usec)); #else LARGE_INTEGER now; QueryPerformanceCounter(&now); if (nt_freq == 0) sys_initntclock(); ! return (((double)(now.QuadPart - nt_inittime.QuadPart)) / nt_freq); #endif } --- 129,138 ---- gettimeofday(&now, 0); if (then.tv_sec == 0 && then.tv_usec == 0) then = now; ! return (now.tv_sec - then.tv_sec) + (1./1000000.) * (now.tv_usec - then.tv_usec); #else LARGE_INTEGER now; QueryPerformanceCounter(&now); if (nt_freq == 0) sys_initntclock(); ! return double(now.QuadPart - nt_inittime.QuadPart) / nt_freq; #endif } *************** *** 141,146 **** struct timeval timout; int didsomething = 0; - int i; - t_fdpoll *fp; fd_set readset, writeset, exceptset; timout.tv_sec = 0; --- 141,144 ---- *************** *** 149,155 **** FD_ZERO(&readset); FD_ZERO(&exceptset); ! for (fp = sys_fdpoll, i = sys_nfdpoll; i--; fp++) FD_SET(fp->fdp_fd, &readset); select(sys_maxfd+1, &readset, &writeset, &exceptset, &timout); ! for (i = 0; i < sys_nfdpoll; i++) if (FD_ISSET(sys_fdpoll[i].fdp_fd, &readset)) { sys_fdpoll[i].fdp_fn(sys_fdpoll[i].fdp_ptr, sys_fdpoll[i].fdp_fd); didsomething = 1; --- 147,154 ---- FD_ZERO(&readset); FD_ZERO(&exceptset); ! t_fdpoll *fp = sys_fdpoll; ! for (int i=sys_nfdpoll; i--; fp++) FD_SET(fp->fdp_fd, &readset); select(sys_maxfd+1, &readset, &writeset, &exceptset, &timout); ! for (int i=0; i<sys_nfdpoll; i++) if (FD_ISSET(sys_fdpoll[i].fdp_fd, &readset)) { sys_fdpoll[i].fdp_fn(sys_fdpoll[i].fdp_ptr, sys_fdpoll[i].fdp_fd); didsomething = 1; *************** *** 202,207 **** action.sa_restorer = 0; #endif ! if (sigaction(signo, &action, 0) < 0) ! perror("sigaction"); } --- 201,205 ---- action.sa_restorer = 0; #endif ! if (sigaction(signo, &action, 0) < 0) perror("sigaction"); } *************** *** 237,242 **** gonzo.it_value.tv_sec = 0; gonzo.it_value.tv_usec = microsec; ! if (microsec) ! sys_signal(SIGALRM, sys_alarmhandler); else sys_signal(SIGALRM, SIG_IGN); setitimer(ITIMER_REAL, &gonzo, 0); --- 235,239 ---- gonzo.it_value.tv_sec = 0; gonzo.it_value.tv_usec = microsec; ! if (microsec) sys_signal(SIGALRM, sys_alarmhandler); else sys_signal(SIGALRM, SIG_IGN); setitimer(ITIMER_REAL, &gonzo, 0); *************** *** 272,288 **** #if (_POSIX_MEMLOCK - 0) >= 200112L ! /* tb: force memlock to physical memory { */ ! struct rlimit mlock_limit; ! mlock_limit.rlim_cur=0; ! /* tb: only if we are really root we can set the hard limit */ ! if (getuid()) ! mlock_limit.rlim_max=100; ! else ! mlock_limit.rlim_max=0; ! setrlimit(RLIMIT_MEMLOCK,&mlock_limit); ! /* } tb */ ! ! if (mlockall(MCL_FUTURE) != -1) ! fprintf(stderr, "memory locking enabled.\n"); #endif --- 269,280 ---- #if (_POSIX_MEMLOCK - 0) >= 200112L ! /* tb: force memlock to physical memory { */ ! struct rlimit mlock_limit; ! mlock_limit.rlim_cur=0; ! /* tb: only if we are really root we can set the hard limit */ ! mlock_limit.rlim_max = getuid() ? 100 : 0; ! setrlimit(RLIMIT_MEMLOCK,&mlock_limit); ! /* } tb */ ! if (mlockall(MCL_FUTURE) != -1) fprintf(stderr, "memory locking enabled.\n"); #endif Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.7 retrieving revision 1.5.4.16.2.20.2.8 diff -C2 -d -r1.5.4.16.2.20.2.7 -r1.5.4.16.2.20.2.8 *** s_audio.c 28 Jun 2007 05:26:48 -0000 1.5.4.16.2.20.2.7 --- s_audio.c 28 Jun 2007 06:21:23 -0000 1.5.4.16.2.20.2.8 *************** *** 889,893 **** if (f < 0) { int i; ! for (i = 0; i != noutdevs ;++i) SETSYMBOL(argv+i, outdevlist + i * DEVDESCSIZE); typedmess(pd->s_thing, selector, noutdevs, argv); } else if (f < noutdevs) { --- 889,893 ---- if (f < 0) { int i; ! for (i = 0; i != noutdevs ;++i) SETSYMBOL(argv+i, gensym(outdevlist + i * DEVDESCSIZE)); typedmess(pd->s_thing, selector, noutdevs, argv); } else if (f < noutdevs) { Index: s_midi.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v retrieving revision 1.4.4.1.2.12.2.6 retrieving revision 1.4.4.1.2.12.2.7 diff -C2 -d -r1.4.4.1.2.12.2.6 -r1.4.4.1.2.12.2.7 *** s_midi.c 3 Jan 2007 07:31:58 -0000 1.4.4.1.2.12.2.6 --- s_midi.c 28 Jun 2007 06:21:23 -0000 1.4.4.1.2.12.2.7 *************** *** 535,539 **** /* start an midi settings dialog window */ void glob_midi_properties(t_pd *dummy, t_floatarg flongform) { - char buf[1024 + 2 * MAXNDEV*(DEVDESCSIZE+4)]; /* these are the devices you're using: */ int nindev, midiindev[MAXMIDIINDEV]; --- 535,538 ----

1 0

pd/src s_audio_oss.c,1.6.4.2.2.2.2.1,1.6.4.2.2.2.2.2
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17779 Modified Files: Tag: desiredata s_audio_oss.c Log Message: cleanup 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.1 retrieving revision 1.6.4.2.2.2.2.2 diff -C2 -d -r1.6.4.2.2.2.2.1 -r1.6.4.2.2.2.2.2 *** s_audio_oss.c 20 Dec 2006 08:28:13 -0000 1.6.4.2.2.2.2.1 --- s_audio_oss.c 28 Jun 2007 06:19:19 -0000 1.6.4.2.2.2.2.2 *************** *** 37,54 **** typedef int32_t t_oss_int32; #define OSS_MAXSAMPLEWIDTH sizeof(t_oss_int32) ! #define OSS_BYTESPERCHAN(width) (sys_dacblocksize * (width)) #define OSS_XFERSAMPS(chans) (sys_dacblocksize* (chans)) #define OSS_XFERSIZE(chans, width) (sys_dacblocksize * (chans) * (width)) - /* GLOBALS */ - static int linux_meters; /* true if we're metering */ - static float linux_inmax; /* max input amplitude */ - static float linux_outmax; /* max output amplitude */ [...1039 lines suppressed...] ! ndev = maxndev; ! for (i = 0; i < ndev; i++) ! { sprintf(indevlist + i * devdescsize, "OSS device #%d", i+1); sprintf(outdevlist + i * devdescsize, "OSS device #%d", i+1); --- 670,683 ---- } } ! thischan += nchannels; } ! return rtnval; } ! void oss_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize) { int i, ndev; *canmulti = 2; /* supports multiple devices */ ! if ((ndev = oss_ndev) > maxndev) ndev = maxndev; ! for (i = 0; i < ndev; i++) { sprintf(indevlist + i * devdescsize, "OSS device #%d", i+1); sprintf(outdevlist + i * devdescsize, "OSS device #%d", i+1);

1 0

pd/src m_sched.c, 1.5.4.35.2.21.2.5, 1.5.4.35.2.21.2.6 s_main.c, 1.7.4.17.2.22.2.18, 1.7.4.17.2.22.2.19
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8973 Modified Files: Tag: desiredata m_sched.c s_main.c Log Message: cleanup Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.18 retrieving revision 1.7.4.17.2.22.2.19 diff -C2 -d -r1.7.4.17.2.22.2.18 -r1.7.4.17.2.22.2.19 *** s_main.c 28 Jun 2007 05:23:32 -0000 1.7.4.17.2.22.2.18 --- s_main.c 28 Jun 2007 05:56:41 -0000 1.7.4.17.2.22.2.19 *************** *** 134,168 **** sys_findprogdir(argv[0]); /* set sys_progname, guipath */ ! /* tb: command line flag to defeat preset loading ! * supported by vibrez.net ! * { */ ! for (i = 0; i != argc; ++i) ! { ! if (!strcmp(argv[i],"-noprefs") || !strcmp(argv[i], "-rcfile")) ! noprefs = 1; ! } ! ! if (!noprefs) sys_rcfile(); /* parse the startup file */ ! /* initalize idle callbacks before starting the gui */ ! sys_init_idle_callbacks(); ! ! /* } tb */ ! ! if (sys_argparse(argc-1, argv+1)) /* parse cmd line */ ! return 1; ! sys_afterargparse(); /* post-argparse settings */ if (sys_verbose || sys_version) fprintf(stderr, "%scompiled %s %s\n", pd_version, pd_compiletime, pd_compiledate); ! if (sys_version) /* if we were just asked our version, exit here. */ ! return 0; ! if (sys_startgui()) return 1; /* start the gui */ ! ! /* tb: { * ! * start the soundfiler helper thread */ #ifdef THREADED_SF ! sys_start_sfthread(); #endif /* THREDED_SF */ - /* try to set ftz and daz */ #ifdef DAZ --- 134,153 ---- sys_findprogdir(argv[0]); /* set sys_progname, guipath */ ! /* tb: command line flag to defeat preset loading */ ! for (i = 0; i != argc; ++i) if (!strcmp(argv[i],"-noprefs") || !strcmp(argv[i],"-rcfile")) noprefs = 1; ! if (!noprefs) sys_rcfile(); /* parse the startup file */ ! /* initalize idle callbacks before starting the gui */ ! sys_init_idle_callbacks(); ! /* } tb */ ! if (sys_argparse(argc-1, argv+1)) return 1; /* parse cmd line */ ! sys_afterargparse(); /* post-argparse settings */ if (sys_verbose || sys_version) fprintf(stderr, "%scompiled %s %s\n", pd_version, pd_compiletime, pd_compiledate); ! if (sys_version) return 0; /* if we were just asked our version, exit here. */ if (sys_startgui()) return 1; /* start the gui */ ! /* tb: { start the soundfiler helper thread */ #ifdef THREADED_SF ! sys_start_sfthread(); #endif /* THREDED_SF */ /* try to set ftz and daz */ #ifdef DAZ *************** *** 170,178 **** _mm_setcsr(_MM_DENORM_ZERO_ON | _mm_getcsr()); #endif /* DAZ */ ! /* } tb */ ! /* jsarlo { */ ! if (sys_externalschedlib) ! { #ifdef MSW typedef int (*t_externalschedlibmain)(char *); --- 155,161 ---- _mm_setcsr(_MM_DENORM_ZERO_ON | _mm_getcsr()); #endif /* DAZ */ ! /* } tb */ /* jsarlo { */ ! if (sys_externalschedlib) { #ifdef MSW typedef int (*t_externalschedlibmain)(char *); Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.21.2.5 retrieving revision 1.5.4.35.2.21.2.6 diff -C2 -d -r1.5.4.35.2.21.2.5 -r1.5.4.35.2.21.2.6 *** m_sched.c 28 Jun 2007 05:23:32 -0000 1.5.4.35.2.21.2.5 --- m_sched.c 28 Jun 2007 05:56:41 -0000 1.5.4.35.2.21.2.6 *************** *** 163,168 **** static int sys_histphase; ! int sys_addhist(int phase) ! { int j, phasewas = sys_histphase; double newtime = sys_getrealtime(); --- 163,167 ---- static int sys_histphase; ! int sys_addhist(int phase) { int j, phasewas = sys_histphase; double newtime = sys_getrealtime(); *************** *** 208,224 **** post("audio I/O error history:"); post("seconds ago\terror type"); ! for (i = 0; i < nresync; i++) ! { int errtype; ! if (nresyncphase < 0) ! nresyncphase += NRESYNC; errtype = oss_resync[nresyncphase].r_error; ! if (errtype < 0 || errtype > 4) ! errtype = 0; ! post("%9.2f\t%s", (sched_diddsp - oss_resync[nresyncphase].r_ntick) ! * ((double)sys_schedblocksize) / sys_dacsr, ! oss_errornames[errtype]); nresyncphase--; } --- 207,218 ---- post("audio I/O error history:"); post("seconds ago\terror type"); ! for (i = 0; i < nresync; i++) { int errtype; ! if (nresyncphase < 0) nresyncphase += NRESYNC; errtype = oss_resync[nresyncphase].r_error; ! if (errtype < 0 || errtype > 4) errtype = 0; post("%9.2f\t%s", (sched_diddsp - oss_resync[nresyncphase].r_ntick) ! * ((double)sys_schedblocksize) / sys_dacsr, oss_errornames[errtype]); nresyncphase--; } *************** *** 229,276 **** static int sched_meterson; ! void sys_log_error(int type) ! { oss_resync[oss_resyncphase].r_ntick = sched_diddsp; oss_resync[oss_resyncphase].r_error = type; oss_nresync++; if (++oss_resyncphase == NRESYNC) oss_resyncphase = 0; ! if (type != ERR_NOTHING && !sched_diored && ! (sched_diddsp >= sched_dioredtime)) ! { sys_vgui("pdtk_pd_dio 1\n"); sched_diored = 1; } ! sched_dioredtime = ! sched_diddsp + (int)(sys_dacsr /(double)sys_schedblocksize); } 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; ! /* if there's no GUI but we're running in "realtime", here is ! where we arrange to ping the watchdog every 2 seconds. */ #ifdef __linux__ ! if (sys_hipriority && (sched_diddsp - sched_nextpingtime > 0)) ! { glob_watchdog(0); ! /* ping every 2 seconds */ ! sched_nextpingtime = sched_diddsp + ! 2 * (int)(sys_dacsr /(double)sys_schedblocksize); } #endif ! if (sched_diddsp - sched_nextmeterpolltime < 0) ! return; ! if (sched_diored && (sched_diddsp - sched_dioredtime > 0)) ! { sys_vgui("pdtk_pd_dio 0\n"); sched_diored = 0; } ! if (sched_meterson) ! { float inmax, outmax; sys_getmeters(&inmax, &outmax); --- 223,260 ---- static int sched_meterson; ! void sys_log_error(int type) { oss_resync[oss_resyncphase].r_ntick = sched_diddsp; oss_resync[oss_resyncphase].r_error = type; oss_nresync++; if (++oss_resyncphase == NRESYNC) oss_resyncphase = 0; ! if (type != ERR_NOTHING && !sched_diored && (sched_diddsp >= sched_dioredtime)) { sys_vgui("pdtk_pd_dio 1\n"); sched_diored = 1; } ! sched_dioredtime = sched_diddsp + (int)(sys_dacsr /(double)sys_schedblocksize); } 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; ! /* if there's no GUI but we're running in "realtime", here is ! where we arrange to ping the watchdog every 2 seconds. */ #ifdef __linux__ ! if (sys_hipriority && (sched_diddsp - sched_nextpingtime > 0)) { glob_watchdog(0); ! /* ping every 2 seconds */ ! sched_nextpingtime = sched_diddsp + 2*(int)(sys_dacsr /(double)sys_schedblocksize); } #endif ! if (sched_diddsp - sched_nextmeterpolltime < 0) return; ! if (sched_diored && sched_diddsp-sched_dioredtime > 0) { sys_vgui("pdtk_pd_dio 0\n"); sched_diored = 0; } ! if (sched_meterson) { float inmax, outmax; sys_getmeters(&inmax, &outmax); *************** *** 279,291 **** inclip = (inmax > 0.999); outclip = (outmax >= 1.0); ! } ! else ! { indb = outdb = 0; inclip = outclip = 0; } if (inclip != sched_lastinclip || outclip != sched_lastoutclip ! || indb != sched_lastindb || outdb != sched_lastoutdb) ! { sys_vgui("pdtk_pd_meters %d %d %d %d\n", indb, outdb, inclip, outclip); sched_lastinclip = inclip; --- 263,272 ---- inclip = (inmax > 0.999); outclip = (outmax >= 1.0); ! } else { indb = outdb = 0; inclip = outclip = 0; } if (inclip != sched_lastinclip || outclip != sched_lastoutclip ! || indb != sched_lastindb || outdb != sched_lastoutdb) { sys_vgui("pdtk_pd_meters %d %d %d %d\n", indb, outdb, inclip, outclip); sched_lastinclip = inclip; *************** *** 294,313 **** sched_lastoutdb = outdb; } ! sched_nextmeterpolltime = ! sched_diddsp + (int)(sys_dacsr /(double)sys_schedblocksize); } ! void glob_meters(void *dummy, float f) ! { ! if (f == 0) ! sys_getmeters(0, 0); sched_meterson = (f != 0); ! sched_lastinclip = sched_lastoutclip = sched_lastindb = sched_lastoutdb = ! -1; } #if 0 ! void glob_foo(void *dummy, t_symbol *s, int argc, t_atom *argv) ! { if (argc) sys_clearhist(); else sys_printhist(); --- 275,289 ---- sched_lastoutdb = outdb; } ! sched_nextmeterpolltime = sched_diddsp + (int)(sys_dacsr /(double)sys_schedblocksize); } ! void glob_meters(void *dummy, float f) { ! if (f == 0) sys_getmeters(0, 0); sched_meterson = (f != 0); ! sched_lastinclip = sched_lastoutclip = sched_lastindb = sched_lastoutdb = -1; } #if 0 ! void glob_foo(void *dummy, t_symbol *s, int argc, t_atom *argv) { if (argc) sys_clearhist(); else sys_printhist(); *************** *** 321,348 **** double sys_time_per_dsp_tick; ! void sched_set_using_dacs(int flag) ! { sched_usedacs = flag; ! if (!flag) ! { sched_referencerealtime = sys_getrealtime(); sched_referencelogicaltime = clock_getlogicaltime(); } ! sys_time_per_dsp_tick = (TIMEUNITPERSEC) * ! ((double)sys_schedblocksize) / sys_dacsr; } ! static void run_clock_callbacks(double next_sys_time) ! { ! if (clock_setlist && clock_setlist->c_settime <= next_sys_time) ! { ! do ! { t_clock *c = clock_setlist; sys_time = c->c_settime; clock_unset(c); /* the compiler should easily inline this */ outlet_setstacklim(); ! (*c->c_fn)(c->c_owner); } while (clock_setlist && clock_setlist->c_settime <= next_sys_time); --- 297,318 ---- double sys_time_per_dsp_tick; ! void sched_set_using_dacs(int flag) { sched_usedacs = flag; ! if (!flag) { sched_referencerealtime = sys_getrealtime(); sched_referencelogicaltime = clock_getlogicaltime(); } ! sys_time_per_dsp_tick = (TIMEUNITPERSEC) * ((double)sys_schedblocksize) / sys_dacsr; } ! static void run_clock_callbacks(double next_sys_time) { ! if (clock_setlist && clock_setlist->c_settime <= next_sys_time) { ! do { t_clock *c = clock_setlist; sys_time = c->c_settime; clock_unset(c); /* the compiler should easily inline this */ outlet_setstacklim(); ! c->c_fn(c->c_owner); } while (clock_setlist && clock_setlist->c_settime <= next_sys_time); *************** *** 396,410 **** int timeforward; waitfortick: ! if (sched_usedacs) ! { timeforward = sys_send_dacs(); /* if dacs remain "idle" for 1 sec, they're hung up. */ if (timeforward != 0) idlecount = 0; ! else ! { idlecount++; ! if (!(idlecount & 31)) ! { static double idletime; /* on 32nd idle, start a clock watch; every --- 366,377 ---- int timeforward; waitfortick: ! if (sched_usedacs) { timeforward = sys_send_dacs(); /* if dacs remain "idle" for 1 sec, they're hung up. */ if (timeforward != 0) idlecount = 0; ! else { idlecount++; ! if (!(idlecount & 31)) { static double idletime; /* on 32nd idle, start a clock watch; every *************** *** 500,505 **** /* osx doesn't define a pthread_mutex_timedlock ... maybe someday it will ... */ ! int sys_timedlock(int microsec) ! { struct timespec timeout; int ret; --- 467,471 ---- /* osx doesn't define a pthread_mutex_timedlock ... maybe someday it will ... */ ! int sys_timedlock(int microsec) { struct timespec timeout; int ret; *************** *** 550,554 **** /* ------------ soft quit ------------------- */ ! /* added by Thomas Grill - just set the quit flag for the scheduler loop this is useful for applications using the PD shared library to signal the scheduler to terminate --- 516,520 ---- /* ------------ soft quit ------------------- */ ! /* added by Thomas Grill - just set the quit flag for the scheduler loop this is useful for applications using the PD shared library to signal the scheduler to terminate *************** *** 560,577 **** } - /* tb: place callbacks in scheduler * { */ ! ! /* linked list of callbacks ! * callback will be freed after returning 0 */ ! typedef struct _sched_callback { ! struct _sched_callback *next; /* next callback in ringbuffer / in fifo */ ! t_int (*function) (t_int *argv); t_int *argv; t_int argc; ! } t_sched_callback; ! void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) { t_sched_callback* noo = (t_sched_callback *)malloc(sizeof(t_sched_callback)); noo->function = callback; --- 526,540 ---- } /* tb: place callbacks in scheduler * { */ ! /* linked list of callbacks; callback will be freed after returning 0 */ ! struct t_sched_callback { ! struct t_sched_callback *next; /* next callback in ringbuffer / in fifo */ ! t_int (*function)(t_int *argv); t_int *argv; t_int argc; ! }; ! void sys_callback(t_int (*callback)(t_int* argv), t_int* argv, t_int argc) { t_sched_callback* noo = (t_sched_callback *)malloc(sizeof(t_sched_callback)); noo->function = callback;

1 0

pd/src s_loader.c, 1.4.4.5.2.10.2.3, 1.4.4.5.2.10.2.4 s_inter.c, 1.5.4.10.2.25.2.16, 1.5.4.10.2.25.2.17
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7860 Modified Files: Tag: desiredata s_loader.c s_inter.c Log Message: cleanup Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.16 retrieving revision 1.5.4.10.2.25.2.17 diff -C2 -d -r1.5.4.10.2.25.2.16 -r1.5.4.10.2.25.2.17 *** s_inter.c 28 Jun 2007 05:23:32 -0000 1.5.4.10.2.25.2.16 --- s_inter.c 28 Jun 2007 05:53:58 -0000 1.5.4.10.2.25.2.17 *************** *** 180,185 **** #define _WIN32_WINNT 0x0400 double end = sys_getrealtime() + (double)microsec * 1e-6; ! do ! { #ifdef MSW SwitchToThread(); --- 180,184 ---- #define _WIN32_WINNT 0x0400 double end = sys_getrealtime() + (double)microsec * 1e-6; ! do { #ifdef MSW SwitchToThread(); *************** *** 256,261 **** #endif ! void sys_set_priority(int higher) ! { #if (_POSIX_PRIORITY_SCHEDULING - 0) >= 200112L struct sched_param par; --- 255,259 ---- #endif ! void sys_set_priority(int higher) { #if (_POSIX_PRIORITY_SCHEDULING - 0) >= 200112L struct sched_param par; *************** *** 299,312 **** #endif ! void sys_set_priority(int higher) ! { #if (_POSIX_PRIORITY_SCHEDULING - 0) >= 200112L struct sched_param par; /* Bearing the table found in 'man realtime' in mind, I found it a */ /* good idea to use 192 as the priority setting for Pd. Any thoughts? */ ! if (higher) ! par.sched_priority = 250; /* priority for watchdog */ ! else ! par.sched_priority = 192; /* priority for pd (DSP) */ if (sched_setscheduler(0, SCHED_FIFO, &par) != -1) fprintf(stderr, "priority %d scheduling enabled.\n", par.sched_priority); --- 297,307 ---- #endif ! void sys_set_priority(int higher) { #if (_POSIX_PRIORITY_SCHEDULING - 0) >= 200112L struct sched_param par; /* Bearing the table found in 'man realtime' in mind, I found it a */ /* good idea to use 192 as the priority setting for Pd. Any thoughts? */ ! if (higher) par.sched_priority = 250; /* priority for watchdog */ ! else par.sched_priority = 192; /* priority for pd (DSP) */ if (sched_setscheduler(0, SCHED_FIFO, &par) != -1) fprintf(stderr, "priority %d scheduling enabled.\n", par.sched_priority); *************** *** 314,319 **** #if (_POSIX_MEMLOCK - 0) >= 200112L ! if (mlockall(MCL_FUTURE) != -1) ! fprintf(stderr, "memory locking enabled.\n"); #endif } --- 309,313 ---- #if (_POSIX_MEMLOCK - 0) >= 200112L ! if (mlockall(MCL_FUTURE) != -1) fprintf(stderr, "memory locking enabled.\n"); #endif } *************** *** 323,335 **** /* ------------------ receiving incoming messages over sockets ------------- */ ! void sys_sockerror(char *s) ! { #ifdef _WIN32 int err = WSAGetLastError(); if (err == 10054) return; ! else if (err == 10044) ! { ! fprintf(stderr, ! "Warning: you might not have TCP/IP \"networking\" turned on\n"); fprintf(stderr, "which is needed for Pd to talk to its GUI layer.\n"); } --- 317,326 ---- /* ------------------ receiving incoming messages over sockets ------------- */ ! void sys_sockerror(char *s) { #ifdef _WIN32 int err = WSAGetLastError(); if (err == 10054) return; ! else if (err == 10044) { ! fprintf(stderr, "Warning: you might not have TCP/IP \"networking\" turned on\n"); fprintf(stderr, "which is needed for Pd to talk to its GUI layer.\n"); } *************** *** 340,345 **** } ! void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr) ! { int nfd = sys_nfdpoll; int size = nfd * sizeof(t_fdpoll); --- 331,335 ---- } ! void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr) { int nfd = sys_nfdpoll; int size = nfd * sizeof(t_fdpoll); *************** *** 355,369 **** } ! void sys_rmpollfn(int fd) ! { int nfd = sys_nfdpoll; int i, size = nfd * sizeof(t_fdpoll); t_fdpoll *fp; ! for (i = nfd, fp = sys_fdpoll; i--; fp++) ! { ! if (fp->fdp_fd == fd) ! { ! while (i--) ! { fp[0] = fp[1]; fp++; --- 345,355 ---- } ! void sys_rmpollfn(int fd) { int nfd = sys_nfdpoll; int i, size = nfd * sizeof(t_fdpoll); t_fdpoll *fp; ! for (i = nfd, fp = sys_fdpoll; i--; fp++) { ! if (fp->fdp_fd == fd) { ! while (i--) { fp[0] = fp[1]; fp++; *************** *** 379,384 **** t_socketreceiver *socketreceiver_new(t_pd *owner, int fd, t_socketnotifier notifier, ! t_socketreceivefn socketreceivefn, int udp) ! { t_socketreceiver *x = (t_socketreceiver *)getbytes(sizeof(*x)); x->inhead = x->intail = 0; --- 365,369 ---- t_socketreceiver *socketreceiver_new(t_pd *owner, int fd, t_socketnotifier notifier, ! t_socketreceivefn socketreceivefn, int udp) { t_socketreceiver *x = (t_socketreceiver *)getbytes(sizeof(*x)); x->inhead = x->intail = 0; *************** *** 470,475 **** } ! void sys_closesocket(int fd) ! { #ifdef UNISTD close(fd); --- 455,459 ---- } ! void sys_closesocket(int fd) { #ifdef UNISTD close(fd); *************** *** 559,564 **** #ifdef __linux__ ! void glob_watchdog(t_pd *dummy) ! { #ifndef WATCHDOGTHREAD if (write(sys_watchfd, "\n", 1) < 1) { --- 543,547 ---- #ifdef __linux__ ! void glob_watchdog(t_pd *dummy) { #ifndef WATCHDOGTHREAD if (write(sys_watchfd, "\n", 1) < 1) { Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.4.4.5.2.10.2.3 retrieving revision 1.4.4.5.2.10.2.4 diff -C2 -d -r1.4.4.5.2.10.2.3 -r1.4.4.5.2.10.2.4 *** s_loader.c 28 Jun 2007 05:23:32 -0000 1.4.4.5.2.10.2.3 --- s_loader.c 28 Jun 2007 05:53:58 -0000 1.4.4.5.2.10.2.4 *************** *** 22,26 **** #include <stdio.h> ! typedef void (*t_xxx)(void); /* naming convention for externs. The names are kept distinct for those --- 22,26 ---- #include <stdio.h> ! typedef void (*t_xxx)(); /* naming convention for externs. The names are kept distinct for those *************** *** 54,62 **** /* maintain list of loaded modules to avoid repeating loads */ ! typedef struct _loadedlist ! { ! struct _loadedlist *ll_next; t_symbol *ll_name; ! } t_loadlist; static t_loadlist *sys_loaded; --- 54,61 ---- /* maintain list of loaded modules to avoid repeating loads */ ! struct t_loadlist { ! t_loadlist *ll_next; t_symbol *ll_name; ! }; static t_loadlist *sys_loaded; *************** *** 88,116 **** HINSTANCE ntdll; #endif ! if ((classname = strrchr(objectname, '/'))) ! classname++; else classname = objectname; ! if (sys_onloadlist(objectname)) ! { post("%s: already loaded", objectname); return 1; } ! for (i = 0, nameptr = classname; i < MAXPDSTRING-7 && *nameptr; nameptr++) ! { char c = *nameptr; ! if ((c>='0' && c<='9') || (c>='A' && c<='Z')|| ! (c>='a' && c<='z' )|| c == '_') ! { symname[i] = c; i++; } ! /* trailing tilde becomes "_tilde" */ ! else if (c == '~' && nameptr[1] == 0) ! { strcpy(symname+i, "_tilde"); i += strlen(symname+i); ! } ! else /* anything you can't put in a C symbol is sprintf'ed in hex */ ! { sprintf(symname+i, "0x%02x", c); i += strlen(symname+i); --- 87,107 ---- HINSTANCE ntdll; #endif ! if ((classname = strrchr(objectname, '/'))) classname++; else classname = objectname; ! if (sys_onloadlist(objectname)) { post("%s: already loaded", objectname); return 1; } ! for (i = 0, nameptr = classname; i < MAXPDSTRING-7 && *nameptr; nameptr++) { char c = *nameptr; ! if ((c>='0' && c<='9') || (c>='A' && c<='Z') || (c>='a' && c<='z' )|| c == '_') { symname[i] = c; i++; } ! /* trailing tilde becomes "_tilde" */ ! else if (c == '~' && nameptr[1] == 0) { strcpy(symname+i, "_tilde"); i += strlen(symname+i); ! } else { /* anything you can't put in a C symbol is sprintf'ed in hex */ sprintf(symname+i, "0x%02x", c); i += strlen(symname+i); *************** *** 119,141 **** } symname[i] = 0; ! if (hexmunge) ! { memmove(symname+6, symname, strlen(symname+1)); strncpy(symname, "setup_", 6); } else strcat(symname, "_setup"); - #if 0 fprintf(stderr, "lib: %s\n", classname); #endif ! /* try looking in the path for (objectname).(sys_dllextent) ... */ ! if ((fd = canvas_open(canvas, objectname, sys_dllextent, ! dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ! goto gotone; ! /* same, with the more generic sys_dllextent2 */ ! if ((fd = canvas_open(canvas, objectname, sys_dllextent2, ! dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ! goto gotone; ! /* next try (objectname)/(classname).(sys_dllextent) ... */ strncpy(filename, objectname, MAXPDSTRING); filename[MAXPDSTRING-2] = 0; --- 110,126 ---- } symname[i] = 0; ! if (hexmunge) { memmove(symname+6, symname, strlen(symname+1)); strncpy(symname, "setup_", 6); } else strcat(symname, "_setup"); #if 0 fprintf(stderr, "lib: %s\n", classname); #endif ! /* try looking in the path for (objectname).(sys_dllextent) ... */ ! if ((fd = canvas_open(canvas, objectname, sys_dllextent , dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) goto gotone; ! /* same, with the more generic sys_dllextent2 */ ! if ((fd = canvas_open(canvas, objectname, sys_dllextent2, dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) goto gotone; ! /* next try (objectname)/(classname).(sys_dllextent) ... */ strncpy(filename, objectname, MAXPDSTRING); filename[MAXPDSTRING-2] = 0; *************** *** 143,152 **** strncat(filename, classname, MAXPDSTRING-strlen(filename)); filename[MAXPDSTRING-1] = 0; ! if ((fd = canvas_open(canvas, filename, sys_dllextent, ! dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ! goto gotone; ! if ((fd = canvas_open(canvas, filename, sys_dllextent2, ! dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) ! goto gotone; return 0; gotone: --- 128,133 ---- strncat(filename, classname, MAXPDSTRING-strlen(filename)); filename[MAXPDSTRING-1] = 0; ! if ((fd = canvas_open(canvas, filename, sys_dllextent , dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) goto gotone; ! if ((fd = canvas_open(canvas, filename, sys_dllextent2, dirbuf, &nameptr, MAXPDSTRING, 1)) >= 0) goto gotone; return 0; gotone: *************** *** 154,158 **** class_set_extern_dir(gensym(dirbuf)); ! /* rebuild the absolute pathname */ strncpy(filename, dirbuf, MAXPDSTRING); filename[MAXPDSTRING-2] = 0; --- 135,139 ---- class_set_extern_dir(gensym(dirbuf)); ! /* rebuild the absolute pathname */ strncpy(filename, dirbuf, MAXPDSTRING); filename[MAXPDSTRING-2] = 0; *************** *** 163,168 **** #ifdef DL_OPEN dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); ! if (!dlobj) ! { post("%s: %s", filename, dlerror()); class_set_extern_dir(&s_); --- 144,148 ---- #ifdef DL_OPEN dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); ! if (!dlobj) { post("%s: %s", filename, dlerror()); class_set_extern_dir(&s_); *************** *** 174,193 **** sys_bashfilename(filename, filename); ntdll = LoadLibrary(filename); ! if (!ntdll) ! { post("%s: couldn't load", filename); class_set_extern_dir(&s_); return 0; } ! makeout = (t_xxx)GetProcAddress(ntdll, symname); #endif ! ! if (!makeout) ! { post("load_object: Symbol \"%s\" not found", symname); class_set_extern_dir(&s_); return 0; } ! (*makeout)(); class_set_extern_dir(&s_); sys_putonloadlist(objectname); --- 154,170 ---- sys_bashfilename(filename, filename); ntdll = LoadLibrary(filename); ! if (!ntdll) { post("%s: couldn't load", filename); class_set_extern_dir(&s_); return 0; } ! makeout = (t_xxx)GetProcAddress(ntdll, symname); #endif ! if (!makeout) { post("load_object: Symbol \"%s\" not found", symname); class_set_extern_dir(&s_); return 0; } ! makeout(); class_set_extern_dir(&s_); sys_putonloadlist(objectname); *************** *** 196,205 **** /* callback type definition */ ! typedef int (*loader_t)(t_canvas *canvas, char *classname); /* linked list of loaders */ ! typedef struct loader_queue { loader_t loader; ! struct loader_queue *next; } loader_queue_t; --- 173,183 ---- /* callback type definition */ ! typedef int (*t_loader)(t_canvas *canvas, char *classname); ! typedef t_loader loader_t; /* linked list of loaders */ ! typedef struct t_loader_queue { loader_t loader; ! t_loader_queue *next; } loader_queue_t; *************** *** 207,219 **** /* register class loader function */ ! void sys_register_loader(loader_t loader) ! { loader_queue_t *q = &loaders; ! while (1) ! { ! if (q->next) ! q = q->next; ! else ! { q->next = (loader_queue_t *)getbytes(sizeof(loader_queue_t)); q->next->loader = loader; --- 185,193 ---- /* register class loader function */ ! void sys_register_loader(loader_t loader) { loader_queue_t *q = &loaders; ! while (1) { ! if (q->next) q = q->next; ! else { q->next = (loader_queue_t *)getbytes(sizeof(loader_queue_t)); q->next->loader = loader; *************** *** 221,236 **** break; } ! } } ! int sys_load_lib(t_canvas *canvas, char *classname) ! { int dspstate = canvas_suspend_dsp(); int ok = 0; loader_queue_t *q; ! for(q = &loaders; q; q = q->next) ! if (ok = q->loader(canvas, classname)) break; canvas_resume_dsp(dspstate); return ok; } - --- 195,207 ---- break; } ! } } ! int sys_load_lib(t_canvas *canvas, char *classname) { int dspstate = canvas_suspend_dsp(); int ok = 0; loader_queue_t *q; ! for(q = &loaders; q; q = q->next) if ((ok = q->loader(canvas, classname))) break; canvas_resume_dsp(dspstate); return ok; }

1 0

pd/src s_audio_alsa.c,1.5.4.5.2.2.2.3,1.5.4.5.2.2.2.4
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1765 Modified Files: Tag: desiredata s_audio_alsa.c Log Message: cleanup 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.3 retrieving revision 1.5.4.5.2.2.2.4 diff -C2 -d -r1.5.4.5.2.2.2.3 -r1.5.4.5.2.2.2.4 *** s_audio_alsa.c 28 Jun 2007 05:26:49 -0000 1.5.4.5.2.2.2.3 --- s_audio_alsa.c 28 Jun 2007 05:37:53 -0000 1.5.4.5.2.2.2.4 *************** *** 57,82 **** 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) ! { [...1005 lines suppressed...] snd_ctl_card_info(ctl, info); desc = snd_ctl_card_info_get_name(info); snd_ctl_card_info_free(info); ! } else { fprintf(stderr, "ALSA card scan error\n"); desc = "???"; *************** *** 808,813 **** ndev++; } ! for (i = 0, j = 2*ndev; i < alsa_nnames; i++, j++) ! { if (j >= maxndev) break; --- 701,705 ---- ndev++; } ! for (i = 0, j = 2*ndev; i < alsa_nnames; i++, j++) { if (j >= maxndev) break;

1 0

pd/src s_midi_pm.c,1.4.4.1.2.8.2.1,1.4.4.1.2.8.2.2
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31098 Modified Files: Tag: desiredata s_midi_pm.c Log Message: cleanup Index: s_midi_pm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v retrieving revision 1.4.4.1.2.8.2.1 retrieving revision 1.4.4.1.2.8.2.2 diff -C2 -d -r1.4.4.1.2.8.2.1 -r1.4.4.1.2.8.2.2 *** s_midi_pm.c 30 Nov 2006 03:57:10 -0000 1.4.4.1.2.8.2.1 --- s_midi_pm.c 28 Jun 2007 05:29:19 -0000 1.4.4.1.2.8.2.2 *************** *** 28,124 **** static int mac_nmidioutdev; ! void sys_do_open_midi(int nmidiin, int *midiinvec, ! int nmidiout, int *midioutvec) ! { int i = 0, j, devno; - int n = 0; PmError err; - Pt_Start(1, 0, 0); /* start a timer with millisecond accuracy */ - mac_nmidiindev = 0; ! for (i = 0; i < nmidiin; i++) ! { ! int found = 0,count = Pm_CountDevices(); ! for (j = 0, devno = 0; j < count && !found; j++) ! { const PmDeviceInfo *info = Pm_GetDeviceInfo(j); ! if (info->input) ! { ! if (devno == midiinvec[i]) ! { err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], j, NULL, 100, NULL, NULL); if (err != pmNoError) ! post("could not open midi input %d (%s): %s", ! j, info->name, Pm_GetErrorText(err)); ! ! else ! { ! if (sys_verbose) ! post("Midi Input (%s) opened.", ! info->name); mac_nmidiindev++; } ! found = 1; } devno++; } } ! if(!found) ! post("could not find midi device %d",midiinvec[i]); ! } ! mac_nmidioutdev = 0; ! for (i = 0; i < nmidiout; i++) ! { ! int found = 0,count = Pm_CountDevices(); ! for (j = 0, devno = 0; j < count && !found; j++) ! { const PmDeviceInfo *info = Pm_GetDeviceInfo(j); ! if (info->output) ! { ! if (devno == midioutvec[i]) ! { ! err = Pm_OpenOutput( ! &mac_midioutdevlist[mac_nmidioutdev], ! j, NULL, 0, NULL, NULL, 0); if (err != pmNoError) ! post("could not open midi output %d (%s): %s", ! j, info->name, Pm_GetErrorText(err)); ! else ! { ! if (sys_verbose) ! post("Midi Output (%s) opened.", ! info->name); mac_nmidioutdev++; } ! found = 1; } devno++; } } ! if(!found) ! post("could not find midi device %d",midioutvec[i]); ! } } ! void sys_close_midi( void) ! { int i; ! for (i = 0; i < mac_nmidiindev; i++) ! Pm_Close(mac_midiindevlist[i]); mac_nmidiindev = 0; ! for (i = 0; i < mac_nmidioutdev; i++) ! Pm_Close(mac_midioutdevlist[i]); ! mac_nmidioutdev = 0; } ! void sys_putmidimess(int portno, int a, int b, int c) ! { PmEvent buffer; /* fprintf(stderr, "put 1 msg %d %d\n", portno, mac_nmidioutdev); */ ! if (portno >= 0 && portno < mac_nmidioutdev) ! { buffer.message = Pm_Message(a, b, c); buffer.timestamp = 0; --- 28,92 ---- static int mac_nmidioutdev; ! void sys_do_open_midi(int nmidiin, int *midiinvec, int nmidiout, int *midioutvec) { int i = 0, j, devno; PmError err; Pt_Start(1, 0, 0); /* start a timer with millisecond accuracy */ mac_nmidiindev = 0; ! for (i = 0; i < nmidiin; i++) { ! int found = 0,count = Pm_CountDevices(); ! for (j = 0, devno = 0; j < count && !found; j++) { const PmDeviceInfo *info = Pm_GetDeviceInfo(j); ! if (info->input) { ! if (devno == midiinvec[i]) { err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], j, NULL, 100, NULL, NULL); if (err != pmNoError) ! post("could not open midi input %d (%s): %s", j, info->name, Pm_GetErrorText(err)); ! else { ! if (sys_verbose) post("Midi Input (%s) opened.", info->name); mac_nmidiindev++; } ! found = 1; } devno++; } } ! if (!found) post("could not find midi device %d",midiinvec[i]); ! } mac_nmidioutdev = 0; ! for (i = 0; i < nmidiout; i++) { ! int found = 0,count = Pm_CountDevices(); ! for (j = 0, devno = 0; j < count && !found; j++) { const PmDeviceInfo *info = Pm_GetDeviceInfo(j); ! if (info->output) { ! if (devno == midioutvec[i]) { ! err = Pm_OpenOutput(&mac_midioutdevlist[mac_nmidioutdev],j,NULL,0,NULL,NULL,0); if (err != pmNoError) ! post("could not open midi output %d (%s): %s",j,info->name,Pm_GetErrorText(err)); ! else { ! if (sys_verbose) post("Midi Output (%s) opened.",info->name); mac_nmidioutdev++; } ! found = 1; } devno++; } } ! if (!found) post("could not find midi device %d",midioutvec[i]); ! } } ! void sys_close_midi (void) { int i; ! for (i = 0; i < mac_nmidiindev; i++) Pm_Close(mac_midiindevlist[i]); mac_nmidiindev = 0; ! for (i = 0; i < mac_nmidioutdev; i++) Pm_Close(mac_midioutdevlist[i]); ! mac_nmidioutdev = 0; } ! void sys_putmidimess(int portno, int a, int b, int c) { PmEvent buffer; /* fprintf(stderr, "put 1 msg %d %d\n", portno, mac_nmidioutdev); */ ! if (portno >= 0 && portno < mac_nmidioutdev) { buffer.message = Pm_Message(a, b, c); buffer.timestamp = 0; *************** *** 128,212 **** } ! static void writemidi4(PortMidiStream* stream, int a, int b, int c, int d) ! { PmEvent buffer; buffer.timestamp = 0; ! buffer.message = ((a & 0xff) | ((b & 0xff) << 8) ! | ((c & 0xff) << 16) | ((d & 0xff) << 24)); Pm_Write(stream, &buffer, 1); } ! ! void sys_putmidibyte(int portno, int byte) ! { ! /* try to parse the bytes into MIDI messages so they can ! fit into PortMidi buffers. */ static int mess[4]; static int nbytes = 0, sysex = 0, i; if (byte >= 0xf8) /* MIDI real time */ writemidi4(mac_midioutdevlist[portno], byte, 0, 0, 0); ! else if (byte == 0xf0) ! { mess[0] = 0xf7; nbytes = 1; sysex = 1; ! } ! else if (byte == 0xf7) ! { mess[nbytes] = byte; ! for (i = nbytes+1; i < 4; i++) ! mess[i] = 0; ! writemidi4(mac_midioutdevlist[portno], ! mess[0], mess[1], mess[2], mess[3]); sysex = 0; nbytes = 0; ! } ! else if (byte >= 0x80) ! { sysex = 0; ! if (byte == 0xf4 || byte == 0xf5 || byte == 0xf6) ! { writemidi4(mac_midioutdevlist[portno], byte, 0, 0, 0); nbytes = 0; ! } ! else ! { mess[0] = byte; nbytes = 1; } ! } ! else if (sysex) ! { mess[nbytes] = byte; nbytes++; ! if (nbytes == 4) ! { writemidi4(mac_midioutdevlist[portno], mess[0], mess[1], mess[2], mess[3]); nbytes = 0; } ! } ! else if (nbytes) ! { int status = mess[0]; ! if (status < 0xf0) ! status &= 0xf0; ! /* 2 byte messages: */ ! if (status == 0xc0 || status == 0xd0 || ! status == 0xf1 || status == 0xf3) ! { ! writemidi4(mac_midioutdevlist[portno], ! mess[0], byte, 0, 0); nbytes = (status < 0xf0 ? 1 : 0); ! } ! else ! { ! if (nbytes == 1) ! { mess[1] = byte; nbytes = 2; ! } ! else ! { writemidi4(mac_midioutdevlist[portno], mess[0], mess[1], byte, 0); --- 96,151 ---- } ! static void writemidi4(PortMidiStream* stream, int a, int b, int c, int d) { PmEvent buffer; buffer.timestamp = 0; ! buffer.message = ((a & 0xff) | ((b & 0xff) << 8) | ((c & 0xff) << 16) | ((d & 0xff) << 24)); Pm_Write(stream, &buffer, 1); } ! void sys_putmidibyte(int portno, int byte) { ! /* try to parse the bytes into MIDI messages so they can fit into PortMidi buffers. */ static int mess[4]; static int nbytes = 0, sysex = 0, i; if (byte >= 0xf8) /* MIDI real time */ writemidi4(mac_midioutdevlist[portno], byte, 0, 0, 0); ! else if (byte == 0xf0) { mess[0] = 0xf7; nbytes = 1; sysex = 1; ! } else if (byte == 0xf7) { mess[nbytes] = byte; ! for (i = nbytes+1; i < 4; i++) mess[i] = 0; ! writemidi4(mac_midioutdevlist[portno], mess[0], mess[1], mess[2], mess[3]); sysex = 0; nbytes = 0; ! } else if (byte >= 0x80) { sysex = 0; ! if (byte == 0xf4 || byte == 0xf5 || byte == 0xf6) { writemidi4(mac_midioutdevlist[portno], byte, 0, 0, 0); nbytes = 0; ! } else { mess[0] = byte; nbytes = 1; } ! } else if (sysex) { mess[nbytes] = byte; nbytes++; ! if (nbytes == 4) { writemidi4(mac_midioutdevlist[portno], mess[0], mess[1], mess[2], mess[3]); nbytes = 0; } ! } else if (nbytes) { int status = mess[0]; ! if (status < 0xf0) status &= 0xf0; ! /* 2 byte messages: */ ! if (status == 0xc0 || status == 0xd0 || status == 0xf1 || status == 0xf3) { ! writemidi4(mac_midioutdevlist[portno], mess[0], byte, 0, 0); nbytes = (status < 0xf0 ? 1 : 0); ! } else { ! if (nbytes == 1) { mess[1] = byte; nbytes = 2; ! } else { writemidi4(mac_midioutdevlist[portno], mess[0], mess[1], byte, 0); *************** *** 217,273 **** } ! void sys_poll_midi(void) ! { ! int i, j, nmess; PmEvent buffer; ! for (i = 0; i < mac_nmidiindev; i++) ! { int nmess = Pm_Read(mac_midiindevlist[i], &buffer, 1); ! if (nmess > 0) ! { ! PmMessage msg = buffer.message; int status = Pm_MessageStatus(msg); ! if(status == 0xf0 || !(status&0x80)) { ! /* sysex header or data */ ! for(j = 0; j < 4; ++j,msg >>= 8) { ! int data = msg&0xff; ! sys_midibytein(i, data); ! if(data == 0xf7) break; /* sysex end */ ! } ! } ! else { ! /* non-sysex */ ! sys_midibytein(i, status); ! ! switch(status>>4) ! { ! case 0x8: /* note off */ ! case 0x9: /* note on */ ! case 0xa: /* poly pressure */ ! case 0xb: /* control change */ ! case 0xe: /* pitch bend */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! sys_midibytein(i, Pm_MessageData2(msg)); ! break; ! case 0xc: /* program change */ ! case 0xd: /* channel pressure */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! break; ! case 0xf: /* system common/realtime messages */ ! switch(status) ! { ! case 0xf1: /* time code */ ! case 0xf3: /* song select */ ! case 0xf6: /* tune request */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! break; ! case 0xf2: /* song position pointer */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! sys_midibytein(i, Pm_MessageData2(msg)); ! break; ! } ! break; ! } } } } --- 156,205 ---- } ! void sys_poll_midi(void) { ! int i, j; PmEvent buffer; ! for (i = 0; i < mac_nmidiindev; i++) { int nmess = Pm_Read(mac_midiindevlist[i], &buffer, 1); ! if (nmess > 0) { ! PmMessage msg = buffer.message; int status = Pm_MessageStatus(msg); ! if(status == 0xf0 || !(status&0x80)) { ! /* sysex header or data */ ! for(j = 0; j < 4; ++j,msg >>= 8) { ! int data = msg&0xff; ! sys_midibytein(i, data); ! if(data == 0xf7) break; /* sysex end */ ! } ! } else { ! /* non-sysex */ ! sys_midibytein(i, status); ! switch(status>>4) { ! case 0x8: /* note off */ ! case 0x9: /* note on */ ! case 0xa: /* poly pressure */ ! case 0xb: /* control change */ ! case 0xe: /* pitch bend */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! sys_midibytein(i, Pm_MessageData2(msg)); ! break; ! case 0xc: /* program change */ ! case 0xd: /* channel pressure */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! break; ! case 0xf: /* system common/realtime messages */ ! switch(status) { ! case 0xf1: /* time code */ ! case 0xf3: /* song select */ ! case 0xf6: /* tune request */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! break; ! case 0xf2: /* song position pointer */ ! sys_midibytein(i, Pm_MessageData1(msg)); ! sys_midibytein(i, Pm_MessageData2(msg)); ! break; } + break; + } + } } } *************** *** 275,283 **** #if 0 ! void sys_listmididevs(void) /* lifted from pa_devs.c in portaudio */ ! { int i,j; ! for (i = 0; i < Pm_CountDevices(); i++) ! { const PmDeviceInfo *info = Pm_GetDeviceInfo(i); printf("%d: %s, %s", i, info->interf, info->name); --- 207,214 ---- #if 0 ! /* lifted from pa_devs.c in portaudio */ ! void sys_listmididevs(void) { int i,j; ! for (i = 0; i < Pm_CountDevices(); i++) { const PmDeviceInfo *info = Pm_GetDeviceInfo(i); printf("%d: %s, %s", i, info->interf, info->name); *************** *** 289,308 **** #endif ! void midi_getdevs(char *indevlist, int *nindevs, ! char *outdevlist, int *noutdevs, int maxndev, int devdescsize) ! { int i, nindev = 0, noutdev = 0; ! for (i = 0; i < Pm_CountDevices(); i++) ! { const PmDeviceInfo *info = Pm_GetDeviceInfo(i); /* post("%d: %s, %s (%d,%d)", i, info->interf, info->name, info->input, info->output); */ ! if (info->input && nindev < maxndev) ! { strcpy(indevlist + nindev * devdescsize, info->name); nindev++; } ! if (info->output && noutdev < maxndev) ! { strcpy(outdevlist + noutdev * devdescsize, info->name); noutdev++; --- 220,234 ---- #endif ! void midi_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int maxndev, int devdescsize) { int i, nindev = 0, noutdev = 0; ! for (i = 0; i < Pm_CountDevices(); i++) { const PmDeviceInfo *info = Pm_GetDeviceInfo(i); /* post("%d: %s, %s (%d,%d)", i, info->interf, info->name, info->input, info->output); */ ! if (info->input && nindev < maxndev) { strcpy(indevlist + nindev * devdescsize, info->name); nindev++; } ! if (info->output && noutdev < maxndev) { strcpy(outdevlist + noutdev * devdescsize, info->name); noutdev++;

1 0

pd/src kernel.c, 1.1.2.44, 1.1.2.45 s_audio.c, 1.5.4.16.2.20.2.6, 1.5.4.16.2.20.2.7 s_audio_alsa.c, 1.5.4.5.2.2.2.2, 1.5.4.5.2.2.2.3
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29966 Modified Files: Tag: desiredata kernel.c s_audio.c s_audio_alsa.c Log Message: cleanup Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.44 retrieving revision 1.1.2.45 diff -C2 -d -r1.1.2.44 -r1.1.2.45 *** kernel.c 28 Jun 2007 03:07:31 -0000 1.1.2.44 --- kernel.c 28 Jun 2007 05:26:48 -0000 1.1.2.45 *************** *** 191,195 **** } ! /*extern "C"*/ void hash_setup (void) { hash_class = class_new(gensym("#V"), (t_newmethod)0 /*hash_new*/, (t_method)hash_free, sizeof(t_object), CLASS_PD, A_GIMME, 0); --- 191,195 ---- } ! /*extern "C"*/ void hash_setup () { hash_class = class_new(gensym("#V"), (t_newmethod)0 /*hash_new*/, (t_method)hash_free, sizeof(t_object), CLASS_PD, A_GIMME, 0); *************** *** 660,664 **** } ! void obj_init(void) { inlet_class = class_new(gensym("inlet"), 0, 0, sizeof(t_inlet), CLASS_PD, 0); floatinlet_class = class_new(gensym("inlet"), 0, 0, sizeof(t_inlet), CLASS_PD, 0); --- 660,664 ---- } ! void obj_init () { inlet_class = class_new(gensym("inlet"), 0, 0, sizeof(t_inlet), CLASS_PD, 0); floatinlet_class = class_new(gensym("inlet"), 0, 0, sizeof(t_inlet), CLASS_PD, 0); *************** *** 684,688 **** /* this is fairly obsolete stuff, I think */ static int outlet_eventno; ! void outlet_setstacklim(void) {outlet_eventno++;} int sched_geteventno( void) {return outlet_eventno;} --- 684,688 ---- /* this is fairly obsolete stuff, I think */ static int outlet_eventno; ! void outlet_setstacklim () {outlet_eventno++;} int sched_geteventno( void) {return outlet_eventno;} *************** *** 1402,1406 **** /* This is externally available, but note that it might later disappear; the whole "newest" thing is a hack which needs to be redesigned. */ ! t_pd *pd_newest(void) {return newest;} /* horribly, we need prototypes for each of the artificial function --- 1402,1406 ---- /* This is externally available, but note that it might later disappear; the whole "newest" thing is a hack which needs to be redesigned. */ ! t_pd *pd_newest () {return newest;} /* horribly, we need prototypes for each of the artificial function *************** *** 1560,1564 **** } ! void nullfn(void) {} t_gotfn getfn(t_pd *x, t_symbol *s) { --- 1560,1564 ---- } ! void nullfn () {} t_gotfn getfn(t_pd *x, t_symbol *s) { *************** *** 1630,1634 **** t_class *binbuf_class; ! t_binbuf *binbuf_new(void) { t_binbuf *x = (t_binbuf *)pd_new(binbuf_class); x->n = 0; --- 1630,1634 ---- t_class *binbuf_class; ! t_binbuf *binbuf_new () { t_binbuf *x = (t_binbuf *)pd_new(binbuf_class); x->n = 0; *************** *** 1955,1959 **** t_atom *binbuf_getvec(t_binbuf *x) {return x->v;} ! int canvas_getdollarzero(void); /* JMZ: --- 1955,1959 ---- t_atom *binbuf_getvec(t_binbuf *x) {return x->v;} ! int canvas_getdollarzero (); /* JMZ: 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.2 retrieving revision 1.5.4.5.2.2.2.3 diff -C2 -d -r1.5.4.5.2.2.2.2 -r1.5.4.5.2.2.2.3 *** s_audio_alsa.c 20 Dec 2006 07:58:01 -0000 1.5.4.5.2.2.2.2 --- s_audio_alsa.c 28 Jun 2007 05:26:49 -0000 1.5.4.5.2.2.2.3 *************** *** 389,393 **** static double timenow; double timelast; ! t_sample *fp, *fp1, *fp2; int i, j, k, iodev, result, ch; int chansintogo, chansouttogo; --- 389,393 ---- static double timenow; double timelast; ! t_sample *fp1, *fp2; int i, j, k, iodev, result, ch; int chansintogo, chansouttogo; *************** *** 647,659 **** /* call this only if both input and output are open */ ! static void alsa_checkiosync( void) ! { ! int i, result, giveup = 1000, alreadylogged = 0, iodev = 0; snd_pcm_sframes_t minphase, maxphase, thisphase, outdelay; ! ! while (1) ! { ! if (giveup-- <= 0) ! { post("tried but couldn't sync A/D/A"); alsa_jittermax += 1; --- 647,655 ---- /* call this only if both input and output are open */ ! static void alsa_checkiosync( void) { ! int result, giveup = 1000, alreadylogged = 0, iodev = 0; snd_pcm_sframes_t minphase, maxphase, thisphase, outdelay; ! while (1) { ! if (giveup-- <= 0) { post("tried but couldn't sync A/D/A"); alsa_jittermax += 1; *************** *** 662,701 **** 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; } thisphase = alsa_buf_samps - outdelay; ! if (thisphase < minphase) ! minphase = thisphase; ! if (thisphase > maxphase) ! maxphase = thisphase; if (outdelay < 0) 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) ! { snd_pcm_prepare(alsa_indev[iodev].a_handle); result = snd_pcm_delay(alsa_indev[iodev].a_handle, &thisphase); } ! if (result < 0) ! { post("output snd_pcm_delay failed: %s", snd_strerror(result)); if (snd_pcm_status(alsa_outdev[iodev].a_handle, --- 658,687 ---- 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; } thisphase = alsa_buf_samps - outdelay; ! if (thisphase < minphase) minphase = thisphase; ! if (thisphase > maxphase) maxphase = thisphase; if (outdelay < 0) 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) { snd_pcm_prepare(alsa_indev[iodev].a_handle); result = snd_pcm_delay(alsa_indev[iodev].a_handle, &thisphase); } ! if (result < 0) { post("output snd_pcm_delay failed: %s", snd_strerror(result)); if (snd_pcm_status(alsa_outdev[iodev].a_handle, *************** *** 706,713 **** return; } ! if (thisphase < minphase) ! minphase = thisphase; ! if (thisphase > maxphase) ! maxphase = thisphase; } /* the "correct" position is for all the phases to be exactly --- 692,697 ---- return; } ! if (thisphase < minphase) minphase = thisphase; ! if (thisphase > maxphase) maxphase = thisphase; } /* the "correct" position is for all the phases to be exactly Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.6 retrieving revision 1.5.4.16.2.20.2.7 diff -C2 -d -r1.5.4.16.2.20.2.6 -r1.5.4.16.2.20.2.7 *** s_audio.c 20 Dec 2006 09:40:11 -0000 1.5.4.16.2.20.2.6 --- s_audio.c 28 Jun 2007 05:26:48 -0000 1.5.4.16.2.20.2.7 *************** *** 189,193 **** int *choutdev, int rate, int dacblocksize, int advance, int schedmode, int enable) { ! int i, *ip; int defaultchannels = SYS_DEFAULTCH; int inchans, outchans; --- 189,193 ---- int *choutdev, int rate, int dacblocksize, int advance, int schedmode, int enable) { ! int i; int defaultchannels = SYS_DEFAULTCH; int inchans, outchans; *************** *** 522,527 **** /* start an audio settings dialog window */ void glob_audio_properties(t_pd *dummy, t_floatarg flongform) { ! char buf[1024 + 2 * MAXNDEV*(DEVDESCSIZE+4)]; ! /* these are the devices you're using: */ int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; --- 522,526 ---- /* start an audio settings dialog window */ void glob_audio_properties(t_pd *dummy, t_floatarg flongform) { ! /* these are the devices you're using: */ int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; *************** *** 531,535 **** 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, i; --- 530,534 ---- 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, i;

1 0

pd/src builtins.c, 1.1.2.16, 1.1.2.17 desire.c, 1.1.2.217.2.135, 1.1.2.217.2.136 desire.h, 1.1.2.49.2.26, 1.1.2.49.2.27
by Mathieu Bouchard 28 Jun '07

28 Jun '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29097 Modified Files: Tag: desiredata builtins.c desire.c desire.h Log Message: go with previous commit Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** builtins.c 11 Jan 2007 20:32:06 -0000 1.1.2.16 --- builtins.c 28 Jun 2007 05:24:18 -0000 1.1.2.17 *************** *** 353,357 **** } } ! extern "C" void *netreceive_new(t_symbol *compatflag, t_floatarg fportno, t_floatarg udpflag) { struct sockaddr_in server; int udp = !!udpflag; --- 353,357 ---- } } ! extern "C" t_text *netreceive_new(t_symbol *compatflag, t_floatarg fportno, t_floatarg udpflag) { struct sockaddr_in server; int udp = !!udpflag; Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.26 retrieving revision 1.1.2.49.2.27 diff -C2 -d -r1.1.2.49.2.26 -r1.1.2.49.2.27 *** desire.h 15 Jan 2007 23:43:29 -0000 1.1.2.49.2.26 --- desire.h 28 Jun 2007 05:24:20 -0000 1.1.2.49.2.27 *************** *** 317,320 **** --- 317,323 ---- void pd_free_zombie(t_pd *x); + /* some other stuff that wasn't in any header */ + void glob_watchdog(t_pd *dummy); + #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) } Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.135 retrieving revision 1.1.2.217.2.136 diff -C2 -d -r1.1.2.217.2.135 -r1.1.2.217.2.136 *** desire.c 16 Jan 2007 01:57:40 -0000 1.1.2.217.2.135 --- desire.c 28 Jun 2007 05:24:18 -0000 1.1.2.217.2.136 *************** *** 870,874 **** t_canvasenvironment *e = canvas_getenv(x); pd_pushsym(x); ! canvas_rename(x, binbuf_realizedollsym(av->a_symbol, e->argc, e->argv, 1), 0); pd_popsym(x); } --- 870,874 ---- t_canvasenvironment *e = canvas_getenv(x); pd_pushsym(x); ! canvas_rename(x, binbuf_realizedollsym(av->a_symbol, e->argc, e->argv, 1), 0); pd_popsym(x); } *************** *** 7622,7629 **** } - extern "C" { - void glob_watchdog(t_pd *dummy); void glob_meters(void *dummy, t_floatarg f); void glob_audiostatus(void *dummy); void glob_finderror(t_pd *dummy); void glob_audio_properties(t_pd *dummy, t_floatarg flongform); --- 7622,7628 ---- } void glob_meters(void *dummy, t_floatarg f); void glob_audiostatus(void *dummy); + extern "C" { void glob_finderror(t_pd *dummy); void glob_audio_properties(t_pd *dummy, t_floatarg flongform);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
22
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 June 2007