Pd-cvs December 2004

pd-cvs@lists.iem.at

7 participants
231 discussions

pd/src s_path.c,1.3.4.3,1.3.4.4
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22491 Modified Files: Tag: devel_0_38 s_path.c Log Message: miller's changes to 0.38-test13 Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.3.4.3 retrieving revision 1.3.4.4 diff -C2 -d -r1.3.4.3 -r1.3.4.4 *** s_path.c 11 Nov 2004 22:30:42 -0000 1.3.4.3 --- s_path.c 14 Dec 2004 09:56:04 -0000 1.3.4.4 *************** *** 439,443 **** else post("no RC file arguments found"); } ! if (sys_argparse(rcargc, rcargv)) { post("error parsing RC arguments"); --- 439,443 ---- else post("no RC file arguments found"); } ! if (sys_argparse(rcargc-1, rcargv+1)) { post("error parsing RC arguments"); *************** *** 459,463 **** return; } ! for (i = 0; i < len; i++) { int c = sys_flags->s_name[i]; --- 459,463 ---- return; } ! for (i = 0; i < len+1; i++) { int c = sys_flags->s_name[i]; *************** *** 483,491 **** if (rcargc >= MAXPDSTRING) break; } } } if (sys_argparse(rcargc, rcargv)) ! post("error parsing RC arguments"); } --- 483,492 ---- if (rcargc >= MAXPDSTRING) break; + state = 0; } } } if (sys_argparse(rcargc, rcargv)) ! post("error parsing startup arguments"); } *************** *** 499,503 **** bug("sys_decodedialog: %s", sp); else sp++; ! for (i = 0; i < MAXPDSTRING-1; i++) { if (!sp[0]) --- 500,504 ---- bug("sys_decodedialog: %s", sp); else sp++; ! for (i = 0; i < MAXPDSTRING-1; i++, sp++) { if (!sp[0]) *************** *** 516,521 **** buf[i] = '$', sp++; else buf[i] = sp[0]; - sp++; } } buf[i] = 0; --- 517,522 ---- buf[i] = '$', sp++; else buf[i] = sp[0]; } + else buf[i] = sp[0]; } buf[i] = 0;

1 0

pd/src s_main.c,1.7.4.4,1.7.4.5
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21465 Modified Files: Tag: devel_0_38 s_main.c Log Message: make callback scheduler selectable by user & miller's changes to 0.38-test13 Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.4 retrieving revision 1.7.4.5 diff -C2 -d -r1.7.4.4 -r1.7.4.5 *** s_main.c 12 Nov 2004 08:21:20 -0000 1.7.4.4 --- s_main.c 14 Dec 2004 09:51:13 -0000 1.7.4.5 *************** *** 8,12 **** */ ! char pd_version[] = "Pd version 0.38 TEST10 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 8,12 ---- */ ! char pd_version[] = "Pd version 0.38 TEST13 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; *************** *** 282,286 **** sys_rcfile(); /* parse the startup file */ #endif ! if (sys_argparse(argc, argv)) /* parse cmd line */ return (1); sys_afterargparse(); /* post-argparse settings */ --- 282,286 ---- sys_rcfile(); /* parse the startup file */ #endif ! if (sys_argparse(argc-1, argv+1)) /* parse cmd line */ return (1); sys_afterargparse(); /* post-argparse settings */ *************** *** 557,561 **** char sbuf[MAXPDSTRING]; int i; - argc--; argv++; while ((argc > 0) && **argv == '-') { --- 557,560 ---- *************** *** 925,929 **** int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; ! int nchindev, nchoutdev, rate, dacblksize, advance; int nmidiindev = 0, midiindev[MAXMIDIINDEV]; int nmidioutdev = 0, midioutdev[MAXMIDIOUTDEV]; --- 924,928 ---- int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; ! int nchindev, nchoutdev, rate, dacblksize, advance, scheduler; int nmidiindev = 0, midiindev[MAXMIDIINDEV]; int nmidioutdev = 0, midioutdev[MAXMIDIOUTDEV]; *************** *** 959,963 **** of argument parsing, and store them again. */ sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblksize, &advance); if (sys_nchin >= 0) { --- 958,962 ---- of argument parsing, and store them again. */ sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblksize, &advance, &scheduler); if (sys_nchin >= 0) { *************** *** 1006,1010 **** dacblksize = sys_main_dacblocksize; sys_open_audio(naudioindev, audioindev, naudioindev, chindev, ! naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblksize, advance, 0); sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0); } --- 1005,1009 ---- dacblksize = sys_main_dacblocksize; sys_open_audio(naudioindev, audioindev, naudioindev, chindev, ! naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblksize, advance, scheduler, 0); sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0); }

1 0

pd/src s_file.c,1.2.4.4,1.2.4.5
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21110 Modified Files: Tag: devel_0_38 s_file.c Log Message: make callback scheduler selectable by user & miller's changes to 0.38-test13 Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.4 retrieving revision 1.2.4.5 diff -C2 -d -r1.2.4.4 -r1.2.4.5 *** s_file.c 11 Nov 2004 22:30:42 -0000 1.2.4.4 --- s_file.c 14 Dec 2004 09:49:48 -0000 1.2.4.5 *************** *** 153,157 **** static void sys_initloadpreferences( void) { - fprintf(stderr, "here 1\n"); } --- 153,156 ---- *************** *** 160,182 **** HKEY hkey; DWORD bigsize = size; - char *val2 = value; LONG err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Pd", 0, KEY_QUERY_VALUE, &hkey); if (err != ERROR_SUCCESS) { ! fprintf(stderr, "here 3\n"); ! return (0); } err = RegQueryValueEx(hkey, key, 0, 0, value, &bigsize); if (err != ERROR_SUCCESS) { ! fprintf(stderr, "here 4\n"); ! RegCloseKey(hkey); return (0); } ! fprintf(stderr, "here 5\n"); ! if (val2 != value) ! fprintf(stderr, "string moved for registry key %s", key); ! RegCloseKey(hkey); return (1); } --- 159,175 ---- HKEY hkey; DWORD bigsize = size; LONG err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Pd", 0, KEY_QUERY_VALUE, &hkey); if (err != ERROR_SUCCESS) { ! return (0); } err = RegQueryValueEx(hkey, key, 0, 0, value, &bigsize); if (err != ERROR_SUCCESS) { ! RegCloseKey(hkey); return (0); } ! RegCloseKey(hkey); return (1); } *************** *** 184,188 **** static void sys_doneloadpreferences( void) { - fprintf(stderr, "here 2\n"); } --- 177,180 ---- *************** *** 272,276 **** int nmidiindev, midiindev[MAXMIDIINDEV]; int nmidioutdev, midioutdev[MAXMIDIOUTDEV]; ! int i, rate = 0, advance = 0, dacblocksize = 0, api, nolib; char prefbuf[MAXPDSTRING], keybuf[80]; sys_initloadpreferences(); --- 264,268 ---- int nmidiindev, midiindev[MAXMIDIINDEV]; int nmidioutdev, midioutdev[MAXMIDIOUTDEV]; ! int i, rate = 0, advance = 0, dacblocksize = 0, api, nolib, scheduler; char prefbuf[MAXPDSTRING], keybuf[80]; sys_initloadpreferences(); *************** *** 318,323 **** if (sys_getpreference("dacblocksize", prefbuf, MAXPDSTRING)) sscanf(prefbuf, "%d", &dacblocksize); sys_open_audio(naudioindev, audioindev, naudioindev, chindev, ! naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblocksize, advance, 0); /* load MIDI preferences */ --- 310,317 ---- if (sys_getpreference("dacblocksize", prefbuf, MAXPDSTRING)) sscanf(prefbuf, "%d", &dacblocksize); + if (sys_getpreference("scheduler", prefbuf, MAXPDSTRING)) + sscanf(prefbuf, "%d", &scheduler); sys_open_audio(naudioindev, audioindev, naudioindev, chindev, ! naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblocksize, advance, scheduler, 0); /* load MIDI preferences */ *************** *** 389,393 **** int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; ! int i, rate, dacblocksize, advance; char buf1[MAXPDSTRING], buf2[MAXPDSTRING]; int nmidiindev, midiindev[MAXMIDIINDEV]; --- 383,387 ---- int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; ! int i, rate, dacblocksize, advance, scheduler; char buf1[MAXPDSTRING], buf2[MAXPDSTRING]; int nmidiindev, midiindev[MAXMIDIINDEV]; *************** *** 402,406 **** sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance); if (naudioindev <= 0) --- 396,400 ---- sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); if (naudioindev <= 0) *************** *** 430,433 **** --- 424,430 ---- sys_putpreference("dacblocksize", buf1); + sprintf(buf1, "%d", scheduler); + sys_putpreference("scheduler", buf1); + /* MIDI settings */ sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);

1 0

pd/src s_audio_asio.cpp,1.1.4.19,1.1.4.20
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20802 Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: make callback scheduler selectable by user Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.19 retrieving revision 1.1.4.20 diff -C2 -d -r1.1.4.19 -r1.1.4.20 *** s_audio_asio.cpp 11 Dec 2004 10:42:40 -0000 1.1.4.19 --- s_audio_asio.cpp 14 Dec 2004 09:48:08 -0000 1.1.4.20 *************** *** 7,11 **** */ - #define CALLBACK_SCHEDULER #ifdef USEAPI_ASIO --- 7,10 ---- *************** *** 60,64 **** extern "C" void asio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, ! int nchoutdev, int *choutdev, int srate); extern "C" void asio_close_audio(void); extern "C" void asio_getdevs(char *indevlist, int *nindevs, --- 59,63 ---- extern "C" void asio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, ! int nchoutdev, int *choutdev, int srate, int scheduler); extern "C" void asio_close_audio(void); extern "C" void asio_getdevs(char *indevlist, int *nindevs, *************** *** 195,199 **** void asio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, ! int nchoutdev, int *choutdev, int srate) { ASIOError status; --- 194,198 ---- void asio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, ! int nchoutdev, int *choutdev, int srate, int scheduler) { ASIOError status; *************** *** 233,242 **** asio_driver = (ASIODriverInfo*) getbytes (sizeof(ASIODriverInfo)); asio_driver->asioVersion = ASIOVERSION; - - #ifdef MSW asio_driver->sysRef = GetDesktopWindow(); ! #else ! asio_driver->sysRef = 0; ! #endif status = ASIOInit(asio_driver); --- 232,237 ---- asio_driver = (ASIODriverInfo*) getbytes (sizeof(ASIODriverInfo)); asio_driver->asioVersion = ASIOVERSION; asio_driver->sysRef = GetDesktopWindow(); ! status = ASIOInit(asio_driver); *************** *** 247,255 **** post("driverversion: %d", asio_driver->driverVersion); post("name: %s", asio_driver->name); - if(status) post("error: %s", asio_driver->errorMessage); #endif switch (status) { case ASE_NotPresent: error("ASIO: ASE_NotPresent"); --- 242,250 ---- post("driverversion: %d", asio_driver->driverVersion); post("name: %s", asio_driver->name); #endif switch (status) { + if(status) post("error: %s", asio_driver->errorMessage); case ASE_NotPresent: error("ASIO: ASE_NotPresent"); *************** *** 285,289 **** status = ASIOGetBufferSize(&asio_minbufsize, &asio_maxbufsize, &asio_prefbufsize, ! &asio_granularity); if(status != ASE_OK) { --- 280,284 ---- status = ASIOGetBufferSize(&asio_minbufsize, &asio_maxbufsize, &asio_prefbufsize, ! &asio_granularity); if(status != ASE_OK) { *************** *** 301,316 **** asio_bufsize = asio_prefbufsize; ! #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 --- 296,312 ---- asio_bufsize = asio_prefbufsize; ! if (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"); *************** *** 358,363 **** asio_bufferinfo = (ASIOBufferInfo*) getbytes (channels * sizeof (ASIOBufferInfo)); ! asio_channelinfo = (ASIOChannelInfo*) getbytes(channels * ! sizeof (ASIOChannelInfo)); if (!(asio_bufferinfo && asio_channelinfo)) { --- 354,359 ---- asio_bufferinfo = (ASIOBufferInfo*) getbytes (channels * sizeof (ASIOBufferInfo)); ! asio_channelinfo = (ASIOChannelInfo*) getbytes(channels * ! sizeof (ASIOChannelInfo)); if (!(asio_bufferinfo && asio_channelinfo)) {

1 0

pd/src s_audio.c,1.5.4.2,1.5.4.3
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20033 Modified Files: Tag: devel_0_38 s_audio.c Log Message: selectable callback scheduler Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.2 retrieving revision 1.5.4.3 diff -C2 -d -r1.5.4.2 -r1.5.4.3 *** s_audio.c 10 Nov 2004 13:47:08 -0000 1.5.4.2 --- s_audio.c 14 Dec 2004 09:45:21 -0000 1.5.4.3 *************** *** 65,68 **** --- 65,70 ---- static int audio_advance; + extern int sys_callbackscheduler; + static int audio_isopen(void) { *************** *** 75,79 **** int *pnaudioindev, int *paudioindev, int *chindev, int *pnaudiooutdev, int *paudiooutdev, int *choutdev, ! int *prate, int *pdacblocksize, int *padvance) { int i; --- 77,81 ---- int *pnaudioindev, int *paudioindev, int *chindev, int *pnaudiooutdev, int *paudiooutdev, int *choutdev, ! int *prate, int *pdacblocksize, int *padvance, int *pscheduler) { int i; *************** *** 89,92 **** --- 91,95 ---- *pdacblocksize = audio_dacblocksize; *padvance = audio_advance; + *pscheduler = sys_callbackscheduler; } *************** *** 177,181 **** void sys_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, ! int *choutdev, int rate, int dacblocksize, int advance, int enable) { int i, *ip; --- 180,184 ---- void sys_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, ! int *choutdev, int rate, int dacblocksize, int advance, int schedmode, int enable) { int i, *ip; *************** *** 363,367 **** if (sys_audioapi == API_ASIO) asio_open_audio(naudioindev, audioindev, nchindev, chindev, ! naudiooutdev, audiooutdev, nchoutdev, choutdev, rate); else #endif --- 366,370 ---- if (sys_audioapi == API_ASIO) asio_open_audio(naudioindev, audioindev, nchindev, chindev, ! naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, scheduler); else #endif *************** *** 434,442 **** int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance; sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance); sys_open_audio(naudioindev, audioindev, naudioindev, chindev, ! naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblocksize, advance, 1); } --- 437,445 ---- int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; ! int rate, dacblocksize, advance, scheduler; sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); sys_open_audio(naudioindev, audioindev, naudioindev, chindev, ! naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblocksize, advance, scheduler, 1); } *************** *** 663,667 **** audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4; ! int rate, dacblocksize, advance; /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; --- 666,670 ---- audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4; ! int rate, dacblocksize, advance, scheduler; /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; *************** *** 693,697 **** sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance); /* post("naudioindev %d naudiooutdev %d longform %f", --- 696,700 ---- sys_get_audio_params(&naudioindev, audioindev, chindev, ! &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); /* post("naudioindev %d naudiooutdev %d longform %f", *************** *** 746,749 **** --- 749,753 ---- int newdacblocksize = atom_getintarg(17, argc, argv); int newadvance = atom_getintarg(18, argc, argv); + int newschedmode = atom_getintarg(19, argc, argv); int statewas; *************** *** 782,786 **** sys_open_audio(nindev, newaudioindev, nindev, newaudioinchan, noutdev, newaudiooutdev, noutdev, newaudiooutchan, ! newrate, newdacblocksize, newadvance, 1); } --- 786,790 ---- sys_open_audio(nindev, newaudioindev, nindev, newaudioinchan, noutdev, newaudiooutdev, noutdev, newaudiooutchan, ! newrate, newdacblocksize, newadvance, newschedmode, 1); }

1 0

pd/src notes.txt,1.6.4.2,1.6.4.3
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18819 Modified Files: Tag: devel_0_38 notes.txt Log Message: merging miller's changes from 0.38-test13 Index: notes.txt =================================================================== RCS file: /cvsroot/pure-data/pd/src/notes.txt,v retrieving revision 1.6.4.2 retrieving revision 1.6.4.3 diff -C2 -d -r1.6.4.2 -r1.6.4.3 *** notes.txt 11 Nov 2004 22:30:42 -0000 1.6.4.2 --- notes.txt 14 Dec 2004 09:40:40 -0000 1.6.4.3 *************** *** 34,41 **** fixed startup flags, path, etc. so that spaces, "," chars, etc., are allowed configure script fixed to handle enable- and disable- correctly doc: document env~ second argument (and why is it no less than 1/10 of first???) - update 0.intro.pd vibrato example --- 34,41 ---- fixed startup flags, path, etc. so that spaces, "," chars, etc., are allowed configure script fixed to handle enable- and disable- correctly + fixed spaces in "startup" dialog doc: document env~ second argument (and why is it no less than 1/10 of first???) vibrato example

1 0

pd/src m_fifo.h,1.1.2.1,1.1.2.2
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18617 Modified Files: Tag: devel_0_38 m_fifo.h Log Message: cleanup Index: m_fifo.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** m_fifo.h 2 Dec 2004 15:17:51 -0000 1.1.2.1 --- m_fifo.h 14 Dec 2004 09:39:56 -0000 1.1.2.2 *************** *** 4,10 **** - #include "m_pd.h" - - /* possibly this can go to m_pd.h */ --- 4,7 ----

1 0

pd/src g_canvas.h,1.3.4.1,1.3.4.2
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17856 Modified Files: Tag: devel_0_38 g_canvas.h Log Message: saving user in the g_array (for testing only) Index: g_canvas.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** g_canvas.h 5 Nov 2004 14:27:45 -0000 1.3.4.1 --- g_canvas.h 14 Dec 2004 09:36:08 -0000 1.3.4.2 *************** *** 214,217 **** --- 214,226 ---- } t_template; + + /* /\* tb: for easy updating when array changes *\/ */ + /* typedef struct _arrayuser */ + /* { */ + /* char** vec_prt; /\* pointer pointing to _array.a_vec *\/ */ + /* t_int* n_prt; /\* pointer pointing to _array.a_n *\/ */ + /* struct _arrayusers* next; /\* next element in list *\/ */ + /* } t_arrayuser; */ + struct _array { *************** *** 223,226 **** --- 232,236 ---- t_gpointer a_gp; /* pointer to scalar or array element we're in */ t_gstub *a_stub; + /* t_arrayuser * a_user; */ };

1 0

pd/src g_array.c,1.3.4.2,1.3.4.3
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17017 Modified Files: Tag: devel_0_38 g_array.c Log Message: miller's changes to 0.38-test13 Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** g_array.c 15 Nov 2004 22:19:46 -0000 1.3.4.2 --- g_array.c 14 Dec 2004 09:32:43 -0000 1.3.4.3 *************** *** 267,271 **** if (x->x_name->s_name[0] == '$') sprintf(cmdbuf, "pdtk_array_dialog %%s \\%s %d %d 0\n", ! x->x_name->s_name, x->x_n, x->x_saveit); else sprintf(cmdbuf, "pdtk_array_dialog %%s %s %d %d 0\n", x->x_name->s_name, x->x_n, x->x_saveit + (x->x_drawasrects<<1)); --- 267,271 ---- if (x->x_name->s_name[0] == '$') sprintf(cmdbuf, "pdtk_array_dialog %%s \\%s %d %d 0\n", ! x->x_name->s_name, x->x_n, x->x_saveit + (x->x_drawasrects<<1)); else sprintf(cmdbuf, "pdtk_array_dialog %%s %s %d %d 0\n", x->x_name->s_name, x->x_n, x->x_saveit + (x->x_drawasrects<<1)); *************** *** 645,651 **** { t_garray *x = (t_garray *)z; - #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ - garray_lock(x); - #endif float x1 = 0x7fffffff, y1 = 0x7fffffff, x2 = -0x7fffffff, y2 = -0x7fffffff; t_canvas *elemtemplatecanvas; --- 645,648 ---- *************** *** 653,656 **** --- 650,656 ---- int elemsize, yonset, wonset, xonset, i; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif if (!array_getfields(x->x_templatesym, &elemtemplatecanvas, &elemtemplate, &elemsize, &xonset, &yonset, &wonset)) *************** *** 975,978 **** --- 975,1013 ---- } + + /* /\* add user to t_garray list *\/ */ + /* static void garray_adduser(t_garray *x, int *size, t_float **vec) */ + /* { */ + /* t_arrayuser * list = x->a_user */ + /* t_arrayuser * elem = getbytes (sizeof (t_arrayuser)); */ + + /* elem->n_ptr = size; */ + /* elem->vec_prt = vec; */ + /* elem->next = NULL; */ + + /* while(list->next != NULL) list = list->next; */ + + /* list->next = elem; */ + + /* return; */ + /* } */ + + /* /\* add user to t_garray list *\/ */ + /* static void garray_updateusers(t_garray *x) */ + /* { */ + /* t_arrayuser * list = x->a_user */ + /* t_arrayuser * elem = getbytes (sizeof (t_arrayuser)); */ + + /* elem->n_ptr = size; */ + /* elem->vec_prt = vec; */ + /* elem->next = NULL; */ + + /* while(list->next != NULL) list = list->next; */ + + /* list->next = elem; */ + + /* return; */ + /* } */ + /* routine that checks if we're just an array of floats and if so returns the goods */ *************** *** 996,999 **** --- 1031,1036 ---- else { + /* garray_adduser(x, size, vec); */ + *size = garray_npoints(x); *vec = (float *)garray_vec(x);

1 0

pd/src d_soundfile.c,1.4.4.8,1.4.4.9
by Tim Blechmann 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16368 Modified Files: Tag: devel_0_38 d_soundfile.c Log Message: some fixes for the threaded soundfiler Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.8 retrieving revision 1.4.4.9 diff -C2 -d -r1.4.4.8 -r1.4.4.9 *** d_soundfile.c 2 Dec 2004 15:22:33 -0000 1.4.4.8 --- d_soundfile.c 14 Dec 2004 09:29:54 -0000 1.4.4.9 *************** *** 1376,1380 **** for (i = 0; i < argc; i++) { ! t_int w[4]; w[0] = (t_int)(garrays[i]); --- 1376,1380 ---- for (i = 0; i < argc; i++) { ! t_int* w = (t_int*)getbytes(4*sizeof(t_int)); w[0] = (t_int)(garrays[i]); *************** *** 1382,1387 **** w[2] = (t_int)finalsize; 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); } --- 1382,1388 ---- w[2] = (t_int)finalsize; 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); } *************** *** 1471,1474 **** --- 1472,1479 ---- reset the graph's coordinates */ + #ifdef SFDEBUG + post("redraw array %p", garray); + #endif + gl = garray->x_glist; if (gl->gl_list == &garray->x_gobj && !garray->x_gobj.g_next) *************** *** 1482,1486 **** garray_redraw(garray); - /* freebytes(w, 2*sizeof(t_int)); */ return 0; } --- 1487,1490 ---- *************** *** 1491,1498 **** t_outlet* outlet = (t_outlet*) w[0]; float itemsread = (float) w[1]; outlet_float (outlet, itemsread); - /* freebytes(w, 2*sizeof(t_int)); */ return 0; } --- 1495,1506 ---- t_outlet* outlet = (t_outlet*) w[0]; float itemsread = (float) w[1]; + + + #ifdef SFDEBUG + post("bang %p", outlet); + #endif outlet_float (outlet, itemsread); return 0; }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
24
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 December 2004