Pd-cvs November 2004

pd-cvs@lists.iem.at

12 participants
283 discussions

pd/src d_soundfile.c,1.4.4.5,1.4.4.6
by Tim Blechmann 27 Nov '04

27 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31244 Modified Files: Tag: devel_0_38 d_soundfile.c Log Message: using idle callbacks for thread synchronisation Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** d_soundfile.c 26 Nov 2004 10:09:46 -0000 1.4.4.5 --- d_soundfile.c 27 Nov 2004 10:22:36 -0000 1.4.4.6 *************** *** 1141,1145 **** TB: adapted for threaded use */ ! static t_int soundfiler_t_read_callback(t_int * w); static void soundfiler_t_read(t_soundfiler *x, t_symbol *s, --- 1141,1150 ---- TB: adapted for threaded use */ ! ! /* callback prototypes */ ! static t_int soundfiler_read_update_garray(t_int * w); ! static t_int soundfiler_read_update_graphics(t_int * w); ! static t_int soundfiler_read_output(t_int * w); ! static void soundfiler_t_read(t_soundfiler *x, t_symbol *s, *************** *** 1166,1169 **** --- 1171,1176 ---- pthread_cond_t resume_after_callback = PTHREAD_COND_INITIALIZER; pthread_mutex_t resume_after_callback_mutex = PTHREAD_MUTEX_INITIALIZER; /* dummy */ + t_int outargs[2]; + while (argc > 0 && argv->a_type == A_SYMBOL && *argv->a_w.w_symbol->s_name == '-') *************** *** 1371,1377 **** t_int w[4]; - post("nvec %p",(char*)nvecs[i]); - post("%d",finalsize); - w[0] = (t_int)(garrays[i]); w[1] = (t_int)nvecs[i]; --- 1378,1381 ---- *************** *** 1379,1383 **** w[3] = (t_int)(&resume_after_callback); ! set_callback(&soundfiler_t_read_callback, w, 4); pthread_cond_wait(&resume_after_callback, &resume_after_callback_mutex); --- 1383,1387 ---- w[3] = (t_int)(&resume_after_callback); ! set_callback(&soundfiler_read_update_garray, w, 4); pthread_cond_wait(&resume_after_callback, &resume_after_callback_mutex); *************** *** 1388,1410 **** #endif ! /* todo: do all graphics updates */ ! ! /* run this in the main thread via callback */ ! /* for (i = 0; i < argc; i++) */ ! /* { */ ! /* t_glist *gl; */ ! /* int n = finalsize; */ ! /* /\* if this is the only array in the graph, */ ! /* reset the graph's coordinates *\/ */ ! /* gl = garrays[i]->x_glist; */ ! /* if (gl->gl_list == &garrays[i]->x_gobj && !garrays[i]->x_gobj.g_next) */ ! /* { */ ! /* vmess(&gl->gl_pd, gensym("bounds"), "ffff", */ ! /* 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); */ ! /* /\* close any dialogs that might have the wrong info now... *\/ */ ! /* gfxstub_deleteforkey(gl); */ ! /* } */ ! /* else garray_redraw(garrays[i]); */ ! /* } */ end: --- 1392,1405 ---- #endif ! /* do all graphics updates ! * run this in the main thread via callback */ ! for (i = 0; i < argc; i++) ! { ! t_int w[2]; ! ! w[0] = (t_int)(garrays[i]); ! w[1] = (t_int)finalsize; ! set_callback(&soundfiler_read_update_graphics, w, 2); ! } end: *************** *** 1430,1441 **** post("bang"); ! /* todo: do this in the idle callback */ ! /* sys_lock(); */ ! /* outlet_float(x->x_obj.ob_outlet, (float)itemsread); */ ! /* sys_unlock(); */ } /* idle callback for threadsafe synchronisation */ ! static t_int soundfiler_t_read_callback(t_int * w) { t_garray* garray = (t_garray*)w[0]; --- 1425,1435 ---- post("bang"); ! outargs[0] = (t_int)x->x_obj.ob_outlet; ! outargs[1] = (t_int)itemsread; ! set_callback(&soundfiler_read_output, outargs, 2); } /* idle callback for threadsafe synchronisation */ ! static t_int soundfiler_read_update_garray(t_int * w) { t_garray* garray = (t_garray*)w[0]; *************** *** 1459,1463 **** garray->x_array.a_vec = (char *) nvec; garray->x_array.a_n = finalsize; ! if (garray->x_usedindsp) canvas_update_dsp(); #ifdef GARRAY_THREAD_LOCK --- 1453,1457 ---- garray->x_array.a_vec = (char *) nvec; garray->x_array.a_n = finalsize; ! /* if (garray->x_usedindsp) canvas_update_dsp(); */ #ifdef GARRAY_THREAD_LOCK *************** *** 1469,1472 **** --- 1463,1468 ---- garray_unlock(garray); #endif + + /* signal helper thread */ pthread_cond_broadcast(conditional); *************** *** 1474,1477 **** --- 1470,1508 ---- } + static t_int soundfiler_read_update_graphics(t_int * w) + { + t_garray* garray = (t_garray*) w[0]; + t_glist *gl; + int n = w[1]; + /* if this is the only array in the graph, + reset the graph's coordinates */ + gl = garray->x_glist; + if (gl->gl_list == &garray->x_gobj && !garray->x_gobj.g_next) + { + vmess(&gl->gl_pd, gensym("bounds"), "ffff", + 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); + /* close any dialogs that might have the wrong info now... */ + gfxstub_deleteforkey(gl); + } + else + garray_redraw(garray); + + return 0; + } + + + static t_int soundfiler_read_output(t_int * w) + { + t_outlet* outlet = (t_outlet*) w[0]; + float itemsread = (float) w[1]; + + outlet_float (outlet, itemsread); + + return 0; + } + + + + /* this is broken out from soundfiler_write below so garray_write can call it too... not done yet though. */

1 0

externals/grill/flext/source flattr_ed.cpp,1.28,1.29
by Thomas Grill 27 Nov '04

27 Nov '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7745/source Modified Files: flattr_ed.cpp Log Message: another fix for the attribute editor fixed const error Index: flattr_ed.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** flattr_ed.cpp 17 Nov 2004 03:30:50 -0000 1.28 --- flattr_ed.cpp 27 Nov 2004 05:01:07 -0000 1.29 *************** *** 524,528 **** } ! sys_vgui(list?"%s {\n":"%s\n",GetString(sym)); AtomList lv; --- 524,528 ---- } ! sys_vgui(const_cast<char *>(list?"%s {\n":"%s\n",GetString(sym))); AtomList lv; *************** *** 543,547 **** sys_vgui("{}\n"); ! sys_vgui(list?"} {\n":" \n"); if(pattr) { --- 543,547 ---- sys_vgui("{}\n"); ! sys_vgui(const_cast<char *>(list?"} {\n":" \n")); if(pattr) { *************** *** 562,566 **** ! sys_vgui(list?"} %i %i %i \n":" %i %i %i \n",tp,sv,pattr?(pattr->BothExist()?2:1):0); } --- 562,566 ---- ! sys_vgui(const_cast<char *>(list?"} %i %i %i \n":" %i %i %i \n"),tp,sv,pattr?(pattr->BothExist()?2:1):0); }

1 0

pd/src m_sched.c,1.5.4.8,1.5.4.9
by Tim Blechmann 26 Nov '04

26 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8958 Modified Files: Tag: devel_0_38 m_sched.c Log Message: fixed bug in idle callback Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.8 retrieving revision 1.5.4.9 diff -C2 -d -r1.5.4.8 -r1.5.4.9 *** m_sched.c 26 Nov 2004 08:38:03 -0000 1.5.4.8 --- m_sched.c 26 Nov 2004 10:11:04 -0000 1.5.4.9 *************** *** 625,630 **** typedef struct _sched_callback { ! t_int (*function) (t_int** argv); ! t_int** argv; t_int argc; struct _sched_callback* next; --- 625,630 ---- typedef struct _sched_callback { ! t_int (*function) (t_int* argv); ! t_int* argv; t_int argc; struct _sched_callback* next; *************** *** 635,639 **** static volatile t_sched_callback * cb_fifo_end = NULL; ! void set_callback(t_int (*callback) (t_int** argv), t_int** argv, t_int argc) { t_sched_callback* new = (t_sched_callback*) getbytes --- 635,639 ---- static volatile t_sched_callback * cb_fifo_end = NULL; ! void set_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) { t_sched_callback* new = (t_sched_callback*) getbytes *************** *** 641,645 **** new->function = callback; ! new->argv = (t_int**) getbytes (argc * sizeof (t_int*)); new->argc = argc; new->next = NULL; --- 641,645 ---- new->function = callback; ! new->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); new->argc = argc; new->next = NULL;

1 0

pd/src d_soundfile.c,1.4.4.4,1.4.4.5
by Tim Blechmann 26 Nov '04

26 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8553 Modified Files: Tag: devel_0_38 d_soundfile.c Log Message: fixed thread synchronisation problem Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.4 retrieving revision 1.4.4.5 diff -C2 -d -r1.4.4.4 -r1.4.4.5 *** d_soundfile.c 24 Nov 2004 14:31:21 -0000 1.4.4.4 --- d_soundfile.c 26 Nov 2004 10:09:46 -0000 1.4.4.5 *************** *** 1007,1010 **** --- 1007,1014 ---- int i; t_sfprocess * next; + + #ifdef DEBUG + post("soundfiler_thread ID: %d", pthread_self()); + #endif while (1) { *************** *** 1137,1140 **** --- 1141,1145 ---- TB: adapted for threaded use */ + static t_int soundfiler_t_read_callback(t_int * w); static void soundfiler_t_read(t_soundfiler *x, t_symbol *s, *************** *** 1143,1152 **** int headersize = -1, channels = 0, bytespersamp = 0, bigendian = 0, resize = 0, i, j; ! long skipframes = 0, ! nframes = 0, finalsize = 0, /* new size */ itemsleft, ! maxsize = DEFMAXSIZE, ! itemsread = 0, bytelimit = 0x7fffffff; int fd = -1; --- 1148,1157 ---- int headersize = -1, channels = 0, bytespersamp = 0, bigendian = 0, resize = 0, i, j; ! long skipframes = 0, ! nframes = 0, finalsize = 0, /* new size */ itemsleft, ! maxsize = DEFMAXSIZE, ! itemsread = 0, bytelimit = 0x7fffffff; int fd = -1; *************** *** 1159,1163 **** int bufframes, nitems; FILE *fp; ! while (argc > 0 && argv->a_type == A_SYMBOL && *argv->a_w.w_symbol->s_name == '-') --- 1164,1169 ---- int bufframes, nitems; FILE *fp; ! pthread_cond_t resume_after_callback = PTHREAD_COND_INITIALIZER; ! pthread_mutex_t resume_after_callback_mutex = PTHREAD_MUTEX_INITIALIZER; /* dummy */ while (argc > 0 && argv->a_type == A_SYMBOL && *argv->a_w.w_symbol->s_name == '-') *************** *** 1185,1191 **** argv[2].a_type != A_FLOAT || ((channels = argv[2].a_w.w_float) < 1) || ! (channels > MAXSFCHANS) || argv[3].a_type != A_FLOAT || ! ((bytespersamp = argv[3].a_w.w_float) < 2) || (bytespersamp > 4) || argv[4].a_type != A_SYMBOL || --- 1191,1197 ---- argv[2].a_type != A_FLOAT || ((channels = argv[2].a_w.w_float) < 1) || ! (channels > MAXSFCHANS) || argv[3].a_type != A_FLOAT || ! ((bytespersamp = argv[3].a_w.w_float) < 2) || (bytespersamp > 4) || argv[4].a_type != A_SYMBOL || *************** *** 1305,1309 **** for (j=0; j!=i;++j) /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],finalsize * sizeof(t_float)); goto done; } --- 1311,1315 ---- for (j=0; j!=i;++j) /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],finalsize * sizeof(t_float)); goto done; } *************** *** 1324,1328 **** for (j=0; j!=i;++j) /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],vecsize[i] * sizeof(t_float)); goto done; } --- 1330,1334 ---- for (j=0; j!=i;++j) /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],vecsize[i] * sizeof(t_float)); goto done; } *************** *** 1332,1335 **** --- 1338,1345 ---- } + #ifdef SFDEBUG + post("transfer soundfile"); + #endif + for (itemsread = 0; itemsread < finalsize; ) { *************** *** 1343,1346 **** --- 1353,1359 ---- } + #ifdef SFDEBUG + post("zeroing remaining elements"); + #endif /* zero out remaining elements of vectors */ for (i = 0; i < argc; i++) *************** *** 1350,1389 **** } ! /* lock the system and reset the garrays */ ! sys_lock(); for (i = 0; i < argc; i++) { ! #ifdef GARRAY_THREAD_LOCK ! garray_lock(garrays[i]); ! #endif ! garrays[i]->x_array.a_vec = (char *) nvecs[i]; ! garrays[i]->x_array.a_n = finalsize; ! #ifdef GARRAY_THREAD_LOCK ! garray_unlock(garrays[i]); ! #endif ! if (garrays[i]->x_usedindsp) canvas_update_dsp(); } - sys_unlock(); ! /* do all graphics updates */ ! for (i = 0; i < argc; i++) ! { ! t_glist *gl; ! int n = finalsize; ! /* if this is the only array in the graph, ! reset the graph's coordinates */ ! gl = garrays[i]->x_glist; ! if (gl->gl_list == &garrays[i]->x_gobj && !garrays[i]->x_gobj.g_next) ! { ! vmess(&gl->gl_pd, gensym("bounds"), "ffff", ! 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); ! /* close any dialogs that might have the wrong info now... */ ! gfxstub_deleteforkey(gl); ! } ! else garray_redraw(garrays[i]); ! } end: /* free the old arrays */ for (i = 0; i < argc; i++) freealignedbytes(vecs[i], vecsize[i] * sizeof(t_float)); --- 1363,1415 ---- } ! /* set idle callback to switch pointers */ ! #ifdef SFDEBUG ! post("locked"); ! #endif for (i = 0; i < argc; i++) { ! t_int w[4]; ! ! post("nvec %p",(char*)nvecs[i]); ! post("%d",finalsize); ! ! w[0] = (t_int)(garrays[i]); ! w[1] = (t_int)nvecs[i]; ! w[2] = (t_int)finalsize; ! w[3] = (t_int)(&resume_after_callback); ! ! set_callback(&soundfiler_t_read_callback, w, 4); ! pthread_cond_wait(&resume_after_callback, &resume_after_callback_mutex); ! } ! #ifdef SFDEBUG ! post("unlocked, doing graphics updates"); ! #endif ! ! /* todo: do all graphics updates */ ! ! /* run this in the main thread via callback */ ! /* for (i = 0; i < argc; i++) */ ! /* { */ ! /* t_glist *gl; */ ! /* int n = finalsize; */ ! /* /\* if this is the only array in the graph, */ ! /* reset the graph's coordinates *\/ */ ! /* gl = garrays[i]->x_glist; */ ! /* if (gl->gl_list == &garrays[i]->x_gobj && !garrays[i]->x_gobj.g_next) */ ! /* { */ ! /* vmess(&gl->gl_pd, gensym("bounds"), "ffff", */ ! /* 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); */ ! /* /\* close any dialogs that might have the wrong info now... *\/ */ ! /* gfxstub_deleteforkey(gl); */ ! /* } */ ! /* else garray_redraw(garrays[i]); */ ! /* } */ end: /* free the old arrays */ + + post("freeing arrays"); for (i = 0; i < argc; i++) freealignedbytes(vecs[i], vecsize[i] * sizeof(t_float)); *************** *** 1402,1408 **** mlockall(MCL_FUTURE); #endif ! sys_lock(); ! outlet_float(x->x_obj.ob_outlet, (float)itemsread); ! sys_unlock(); } --- 1428,1475 ---- mlockall(MCL_FUTURE); #endif ! post("bang"); ! ! /* todo: do this in the idle callback */ ! /* sys_lock(); */ ! /* outlet_float(x->x_obj.ob_outlet, (float)itemsread); */ ! /* sys_unlock(); */ ! } ! ! /* idle callback for threadsafe synchronisation */ ! static t_int soundfiler_t_read_callback(t_int * w) ! { ! t_garray* garray = (t_garray*)w[0]; ! t_int nvec = w[1]; ! t_int finalsize = w[2]; ! pthread_cond_t * conditional = (pthread_cond_t*) w[3]; ! ! post("w: %p",w); ! post("%p",garray); ! post("nvec %p",(char*)nvec); ! post("%d",finalsize); ! ! #ifdef GARRAY_THREAD_LOCK ! ! #ifdef SFDEBUG ! post("lock array %p", garray); ! #endif ! ! garray_lock(garray); ! #endif ! garray->x_array.a_vec = (char *) nvec; ! garray->x_array.a_n = finalsize; ! if (garray->x_usedindsp) canvas_update_dsp(); ! ! #ifdef GARRAY_THREAD_LOCK ! ! #ifdef SFDEBUG ! post("unlock array %p", garray); ! #endif ! ! garray_unlock(garray); ! #endif ! pthread_cond_broadcast(conditional); ! ! return 0; }

1 0

pd/src s_audio_pa.c,1.4.4.1,1.4.4.2
by IOhannes m zmölnig 26 Nov '04

26 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7426 Modified Files: Tag: devel_0_38 s_audio_pa.c Log Message: hopefully this fixes the allocation of variable-sized arrays on vc (using alloca instead of float[variable]) Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** s_audio_pa.c 10 Nov 2004 13:47:09 -0000 1.4.4.1 --- s_audio_pa.c 26 Nov 2004 10:03:41 -0000 1.4.4.2 *************** *** 15,18 **** --- 15,28 ---- #include "s_audio_pablio.h" + #ifdef MSW + /* jmz thinks that we have to include: + * on Windows: <malloc.h> (probably this is already included?) + * on linux: <alloca.h> (might be true for osX too, no way to check right now...) + */ + # include <malloc.h> + #else + # include <alloca.h> + #endif + /* LATER try to figure out how to handle default devices in portaudio; the way s_audio.c handles them isn't going to work here. */ *************** *** 26,30 **** #define MAX_PA_CHANS 32 - #define MAX_SAMPLES_PER_FRAME MAX_PA_CHANS * sys_dacblocksize #ifndef PA19 --- 36,39 ---- *************** *** 138,144 **** int pa_send_dacs(void) { ! float samples[MAX_SAMPLES_PER_FRAME], *fp1, *fp2; int i, j; double timebefore; timebefore = sys_getrealtime(); --- 147,155 ---- int pa_send_dacs(void) { ! float *samples, *fp1, *fp2; int i, j; double timebefore; + + samples=(float*)alloca(sizeof(float) * MAX_PA_CHANS * sys_dacblocksize); timebefore = sys_getrealtime();

1 0

pd/src m_sched.c,1.5.4.7,1.5.4.8
by Tim Blechmann 26 Nov '04

26 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23554 Modified Files: Tag: devel_0_38 m_sched.c Log Message: reverting to yesterdays version Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.7 retrieving revision 1.5.4.8 diff -C2 -d -r1.5.4.7 -r1.5.4.8 *** m_sched.c 25 Nov 2004 23:16:09 -0000 1.5.4.7 --- m_sched.c 26 Nov 2004 08:38:03 -0000 1.5.4.8 *************** *** 667,676 **** do { ! int resume; ! if(cb_fifo_begin->argc) ! resume = cb_fifo_begin->function(cb_fifo_begin->argv); ! else ! resume = cb_fifo_begin->function(); ! if (resume == 0) { --- 667,672 ---- do { ! int resume = cb_fifo_begin->function(cb_fifo_begin->argv); ! if (resume == 0) {

1 0

externals/grill/dyn build-pd-linux.sh,1.4,1.5 config-pd-linux.txt,1.6,1.7 makefile.pd-linux,1.4,1.5 dyn_conn.cpp,1.1,1.2 dyn_pd.h,1.1,1.2
by Thomas Grill 26 Nov '04

26 Nov '04

Update of /cvsroot/pure-data/externals/grill/dyn In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19124 Modified Files: dyn_conn.cpp dyn_pd.h Added Files: build-pd-linux.sh config-pd-linux.txt makefile.pd-linux Log Message: makefiles for linux Index: dyn_pd.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dyn/dyn_pd.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dyn_pd.h 27 Oct 2004 18:19:51 -0000 1.1 --- dyn_pd.h 26 Nov 2004 05:02:33 -0000 1.2 *************** *** 28,30 **** #endif ! #endif \ No newline at end of file --- 28,31 ---- #endif ! #endif ! Index: dyn_conn.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dyn/dyn_conn.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dyn_conn.cpp 27 Oct 2004 18:19:51 -0000 1.1 --- dyn_conn.cpp 26 Nov 2004 05:02:33 -0000 1.2 *************** *** 38,40 **** } } ! */ \ No newline at end of file --- 38,41 ---- } } ! */ ! --- NEW FILE: config-pd-linux.txt --- # your c++ compiler (define only if it's different than g++) # CXX=g++-3.3 # prefix to install the dyn library and header files # (leave blank to omit installation) INSTDIR=/usr/local # where are the PD header files? (m_pd.h, m_imp.h, g_canvas.h) PDPATH=/usr/src/pd/src # where should flext libraries be built? TARGDIR=./pd-linux # where should the dyn library and header be installed? # (leave blank to omit installation) PREFIX=/usr/local # additional compiler flags # (check if they fit for your system!) # UFLAGS=-march=pentium4 --- NEW FILE: build-pd-linux.sh --- #!/bin/sh . config-pd-linux.txt make -f makefile.pd-linux && { if [ $INSTDIR != "" ]; then echo Now install as root su -c "make -f makefile.pd-linux install" fi } --- NEW FILE: makefile.pd-linux --- # Makefile for gcc @ linux # # usage: # to build run "make -f makefile.pd-linux" # to install (as root), do "make -f makefile.pd-linux install" # CONFIG=config-pd-linux.txt include ${CONFIG} # compiler+linker stuff INCLUDES=${PDPATH} FLAGS=${UFLAGS} # compiler flags for optimized build CFLAGS=-O2 # compiler flags for debug build CFLAGS_D=-g # flags for shared linking LSHFLAGS= -shared # ---------------------------------------------- # the rest can stay untouched # ---------------------------------------------- # all the source files from the package include make-files.txt MAKEFILE=makefile.pd-linux TARGET=$(TARGDIR)/lib$(NAME).so TARGET_D=$(TARGDIR)/lib$(NAME)_d.so HDRS=$(PHDRS) $(IHDRS) all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGDIR): mkdir $(TARGDIR) $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst %,$(SRCDIR)/%,$(IHDRS)) $(MAKEFILE) $(CONFIG) touch $@ $(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c -shared $(CFLAGS) $(CFLAGS_T) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ $(TARGDIR)/%.do : $(SRCDIR)/%.cpp $(CXX) -c -shared $(CFLAGS_D) $(CFLAGS_T) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(CXX) $(LSHFLAGS) -o $@ $^ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) $(CXX) $(LSHFLAGS) -o $@ $^ .PHONY: clean install clean: rm -f $(TARGDIR)/*.{o,do} $(TARGET) $(TARGET_D) ifdef PREFIX install:: $(PREFIX) endif install:: $(TARGET) $(TARGET_D) # cp $(patsubst %,$(SRCDIR)/%,$(PHDRS)) $(PREFIX)/include cp $(TARGDIR)/lib*.dylib $(PREFIX)/lib

1 0

pd/src m_sched.c,1.5.4.6,1.5.4.7
by Tim Blechmann 26 Nov '04

26 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21591 Modified Files: Tag: devel_0_38 m_sched.c Log Message: improved idle callbacks Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.6 retrieving revision 1.5.4.7 diff -C2 -d -r1.5.4.6 -r1.5.4.7 *** m_sched.c 24 Nov 2004 18:57:40 -0000 1.5.4.6 --- m_sched.c 25 Nov 2004 23:16:09 -0000 1.5.4.7 *************** *** 667,671 **** do { ! if (cb_fifo_begin->function(cb_fifo_begin->argv) == 0) { t_sched_callback* next = cb_fifo_begin->next; --- 667,677 ---- do { ! int resume; ! if(cb_fifo_begin->argc) ! resume = cb_fifo_begin->function(cb_fifo_begin->argv); ! else ! resume = cb_fifo_begin->function(); ! ! if (resume == 0) { t_sched_callback* next = cb_fifo_begin->next; *************** *** 678,682 **** } while ( sys_getrealtime() > stop && cb_fifo_begin); ! return 0; /* don't sleep */ } --- 684,688 ---- } while ( sys_getrealtime() > stop && cb_fifo_begin); ! return 0; /* don't sleep */ } *************** *** 689,693 **** #error to be implemented ! #endif /* LOCK_FREE */ /* } tb */ --- 695,699 ---- #error to be implemented ! #endif /* } tb */

1 0

pd/src s_audio_asio.cpp,1.1.4.15,1.1.4.16
by Tim Blechmann 26 Nov '04

26 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21121 Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: some better debug messages Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.15 retrieving revision 1.1.4.16 diff -C2 -d -r1.1.4.15 -r1.1.4.16 *** s_audio_asio.cpp 23 Nov 2004 23:08:53 -0000 1.1.4.15 --- s_audio_asio.cpp 25 Nov 2004 23:13:24 -0000 1.1.4.16 *************** *** 7,10 **** --- 7,12 ---- */ + #define CALLBACK_SCHEDULER + #ifdef USEAPI_ASIO *************** *** 148,151 **** --- 150,154 ---- static long asio_bufsize; /* hardware buffer size */ + static long asio_ticks_per_callback; unsigned long sys_reftime; *************** *** 296,310 **** /* todo: buffer size hardcoded to asio hardware */ ! asio_bufsize = asio_prefbufsize; #ifdef CALLBACK_SCHEDULER ! if (asio_bufsize % 2 == 0) { /* use callback scheduler */ sys_keepsched = 0; sys_callbackscheduler = 1; } #endif ! /* set sample rate */ if(ASIOCanSampleRate( asio_srate ) != ASE_OK) --- 299,318 ---- /* todo: buffer size hardcoded to asio hardware */ ! asio_bufsize = asio_maxbufsize; #ifdef CALLBACK_SCHEDULER ! if ( asio_bufsize % sys_dacblocksize == 0 ) { /* use callback scheduler */ sys_keepsched = 0; sys_callbackscheduler = 1; + asio_ticks_per_callback = asio_bufsize / sys_dacblocksize; + post("ASIO: using callback-based scheduler"); } + else + post("ASIO: using traditional scheduler"); #endif ! ! /* set sample rate */ if(ASIOCanSampleRate( asio_srate ) != ASE_OK) *************** *** 395,400 **** ASIOGetChannelInfo(&asio_channelinfo[i]); ! if (i < sys_outchannels) { ! asio_converter[i] = asio_converter_send(asio_channelinfo[i].type); asio_out_samplewidth[i] = asio_samplewidth(asio_channelinfo[i].type); } --- 403,413 ---- ASIOGetChannelInfo(&asio_channelinfo[i]); ! #ifdef ASIODEBUG ! post("ASIO: channel %d type %d", i, asio_channelinfo[i].type); ! #endif ! ! if (i < sys_outchannels) ! { ! asio_converter[i] = asio_converter_send(asio_channelinfo[i].type); asio_out_samplewidth[i] = asio_samplewidth(asio_channelinfo[i].type); } *************** *** 604,607 **** --- 617,621 ---- return SENDDACS_NO; } + #endif *************** *** 700,703 **** --- 714,726 ---- { ASIOTime time; + #ifdef ASIODEBUG + static int written = 0; + if(written == 0) + { + post("ASIO: asio_bufferSwitch_cb"); + written = 1; + } + #endif + memset (&time, 0, sizeof (time)); /* todo: do we need to syncronize with other media ??? */ *************** *** 1228,1231 **** --- 1251,1263 ---- { ASIOTime time; + #ifdef ASIODEBUG + static int written = 0; + if(written == 0) + { + post("ASIO: asio_bufferSwitch_cb"); + written = 1; + } + #endif + memset (&time, 0, sizeof (time)); /* todo: do we need to syncronize with other media ??? */ *************** *** 1255,1259 **** sys_lock(); ! for (int j = 0; j < asio_bufsize; j += sys_dacblocksize) { /* get sounds from input channels */ --- 1287,1291 ---- sys_lock(); ! for (int j = 0; j != asio_ticks_per_callback; j++) { /* get sounds from input channels */

1 0

doc/pddp all_about_hid_mapping.pd,1.2,1.3
by Hans-Christoph Steiner 25 Nov '04

25 Nov '04

Update of /cvsroot/pure-data/doc/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30966 Modified Files: all_about_hid_mapping.pd Log Message: created [buttongate] and [keygate] following [gate] Index: all_about_hid_mapping.pd =================================================================== RCS file: /cvsroot/pure-data/doc/pddp/all_about_hid_mapping.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** all_about_hid_mapping.pd 25 Nov 2004 02:38:53 -0000 1.2 --- all_about_hid_mapping.pd 25 Nov 2004 02:43:02 -0000 1.3 *************** *** 1,3 **** ! #N canvas 230 123 867 495 10; #N canvas 0 22 450 300 graph1 0; #X array cuberoot 100 float 0; --- 1,3 ---- ! #N canvas 230 123 871 499 10; #N canvas 0 22 450 300 graph1 0; #X array cuberoot 100 float 0; *************** *** 124,127 **** --- 124,129 ---- #X obj 289 235 hid_squareroot; #X text 612 297 exponential; + #X obj 29 68 buttongate; + #X obj 125 66 keygate; #X connect 4 0 22 0; #X connect 5 0 15 0;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
29
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 November 2004