Pd-cvs December 2004

pd-cvs@lists.iem.at

7 participants
231 discussions

externals/grill/flext/source flattr.cpp,1.26,1.27 flattr_ed.cpp,1.30,1.31 fldsp.cpp,1.21,1.22 flext.cpp,1.29,1.30 flitem.cpp,1.12,1.13 fllib.cpp,1.27,1.28 flout.cpp,1.17,1.18 flstdc.h,1.26,1.27
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32521/source Modified Files: flattr.cpp flattr_ed.cpp fldsp.cpp flext.cpp flitem.cpp fllib.cpp flout.cpp flstdc.h Log Message: dropped support for Max UI objects fix for _long_ attribute dialogs delete project builder project (in favor of xcode) typo fixed in attribute editor add xcode project some fixes for OSX builds Index: flstdc.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** flstdc.h 24 Aug 2004 02:34:30 -0000 1.26 --- flstdc.h 16 Dec 2004 05:01:07 -0000 1.27 *************** *** 126,130 **** ! typedef t_pxbox t_sigobj; // that's the all-in-one object type of Max/MSP (not very memory-efficent, i guess) typedef t_patcher t_canvas; --- 126,130 ---- ! typedef t_pxobject t_sigobj; // that's the all-in-one object type of Max/MSP (not very memory-efficent, i guess) typedef t_patcher t_canvas; Index: flitem.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flitem.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** flitem.cpp 21 Jun 2004 13:58:19 -0000 1.12 --- flitem.cpp 16 Dec 2004 05:01:07 -0000 1.13 *************** *** 31,35 **** flext_base::ItemCont::ItemCont(): ! memsize(0),size(0),members(0),cont(NULL) {} --- 31,35 ---- flext_base::ItemCont::ItemCont(): ! members(0),memsize(0),size(0),cont(NULL) {} Index: fldsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldsp.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** fldsp.cpp 21 Jun 2004 13:58:19 -0000 1.21 --- fldsp.cpp 16 Dec 2004 05:01:06 -0000 1.22 *************** *** 28,33 **** #if FLEXT_SYS == FLEXT_SYS_MAX ! // dsp_initclass(); ! dsp_initboxclass(); add_dsp(c,cb_dsp); #elif FLEXT_SYS == FLEXT_SYS_PD --- 28,33 ---- #if FLEXT_SYS == FLEXT_SYS_MAX ! dsp_initclass(); ! // dsp_initboxclass(); add_dsp(c,cb_dsp); #elif FLEXT_SYS == FLEXT_SYS_PD *************** *** 47,52 **** blksz(fts_dsp_get_tick_size()), #else ! srate(sys_getsr()), // should we set it? ! blksz(sys_getblksize()), #endif #if FLEXT_SYS == FLEXT_SYS_PD --- 47,51 ---- blksz(fts_dsp_get_tick_size()), #else ! srate(sys_getsr()),blksz(sys_getblksize()), #endif #if FLEXT_SYS == FLEXT_SYS_PD *************** *** 54,59 **** chnsout(sys_get_outchannels()), #elif FLEXT_SYS == FLEXT_SYS_MAX ! chnsin(sys_getch()), ! chnsout(sys_getch()), #elif FLEXT_SYS == FLEXT_SYS_JMAX #pragma message("not implemented") --- 53,57 ---- chnsout(sys_get_outchannels()), #elif FLEXT_SYS == FLEXT_SYS_MAX ! chnsin(0),chnsout(0), #elif FLEXT_SYS == FLEXT_SYS_JMAX #pragma message("not implemented") Index: flattr_ed.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** flattr_ed.cpp 28 Nov 2004 05:00:59 -0000 1.30 --- flattr_ed.cpp 16 Dec 2004 05:01:06 -0000 1.31 *************** *** 448,452 **** static size_t escapeit(char *dst,size_t maxlen,const char *src) { - int ret = 0; char *d; for(d = dst; *src && (d-dst) < (int)maxlen; ++src) { --- 448,451 ---- Index: flext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flext.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** flext.cpp 9 Sep 2004 04:00:47 -0000 1.29 --- flext.cpp 16 Dec 2004 05:01:06 -0000 1.30 *************** *** 62,67 **** #if FLEXT_SYS == FLEXT_SYS_MAX // according to David Z. one should do that first... ! // if(insigs) dsp_free(thisHdr()); ! if(insigs) dsp_freebox(thisHdr()); #endif --- 62,67 ---- #if FLEXT_SYS == FLEXT_SYS_MAX // according to David Z. one should do that first... ! if(insigs) dsp_free(thisHdr()); ! // if(insigs) dsp_freebox(thisHdr()); #endif Index: flattr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** flattr.cpp 28 Oct 2004 04:01:46 -0000 1.26 --- flattr.cpp 16 Dec 2004 05:01:06 -0000 1.27 *************** *** 29,34 **** Item(NULL),index(0), flags(fl|afl_shown), ! argtp(tp),fun(f),tag(t), ! counter(NULL) {} --- 29,34 ---- Item(NULL),index(0), flags(fl|afl_shown), ! argtp(tp),fun(f), ! counter(NULL),tag(t) {} Index: flout.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flout.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** flout.cpp 31 Aug 2004 04:01:13 -0000 1.17 --- flout.cpp 16 Dec 2004 05:01:07 -0000 1.18 *************** *** 231,236 **** if(insigs) ! // dsp_setup(thisHdr(),insigs); // signal inlets ! dsp_setupbox(thisHdr(),insigs); // signal inlets } #elif FLEXT_SYS == FLEXT_SYS_JMAX --- 231,236 ---- if(insigs) ! dsp_setup(thisHdr(),insigs); // signal inlets ! // dsp_setupbox(thisHdr(),insigs); // signal inlets } #elif FLEXT_SYS == FLEXT_SYS_JMAX Index: fllib.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fllib.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** fllib.cpp 23 Aug 2004 02:33:17 -0000 1.27 --- fllib.cpp 16 Dec 2004 05:01:07 -0000 1.28 *************** *** 282,286 **** // add to name list const t_symbol *lsym = MakeSymbol(c); ! libclass *lcl = FindName(lsym,lo); #if FLEXT_SYS == FLEXT_SYS_PD --- 282,286 ---- // add to name list const t_symbol *lsym = MakeSymbol(c); ! /*libclass *lcl =*/ FindName(lsym,lo); #if FLEXT_SYS == FLEXT_SYS_PD

1 0

externals/grill/flext/flext.xcode project.pbxproj,NONE,1.1
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext/flext.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32521/flext.xcode Added Files: project.pbxproj Log Message: dropped support for Max UI objects fix for _long_ attribute dialogs delete project builder project (in favor of xcode) typo fixed in attribute editor add xcode project some fixes for OSX builds --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 39; objects = { 034768DDFF38A45A11DB9C8B = { children = ( E99747CD0770545100206F68, E997483F0770570800206F68, E9974886077058C100206F68, E99749BE07705CC400206F68, E9974BC407705F1400206F68, E9974BFA07705F4F00206F68, ); isa = PBXGroup; name = Products; refType = 4; [...3029 lines suppressed...] F55CED860383E50201A80AC9, F5CBC5B804757BC801A0C81C, F5CBC5B904757BC801A0C81C, F5CBC5BA04757BC801A0C81C, F5CBC5BB04757BC801A0C81C, F5CBC5BC04757BC801A0C81C, F5CBC5BD04757BC801A0C81C, F5CBC5BE04757BC801A0C81C, F5CBC5BF04757BC801A0C81C, F5CBC5C004757BC801A0C81C, F5CBC5C104757BC801A0C81C, ); isa = PBXGroup; name = Defs; refType = 4; sourceTree = "<group>"; }; }; rootObject = 0867D690FE84028FC02AAC07; }

1 0

externals/grill/flext changes.txt,1.62,1.63
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32521 Modified Files: changes.txt Log Message: dropped support for Max UI objects fix for _long_ attribute dialogs delete project builder project (in favor of xcode) typo fixed in attribute editor add xcode project some fixes for OSX builds Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** changes.txt 15 Nov 2004 03:30:59 -0000 1.62 --- changes.txt 16 Dec 2004 05:01:05 -0000 1.63 *************** *** 21,24 **** --- 21,25 ---- - show saveable attributes on object select - fix for long attribute dialogs + - dropped support for Max UI objects 0.4.7:

1 0

externals/grill/flext/flext.xcode - New directory
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext/flext.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32465/flext.xcode Log Message: Directory /cvsroot/pure-data/externals/grill/flext/flext.xcode added to the repository

1 0

externals/grill/flext/flext.pbproj project.pbxproj,1.13,NONE
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext/flext.pbproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32438/flext.pbproj Removed Files: project.pbxproj Log Message: remove deleted files --- project.pbxproj DELETED ---

1 0

externals/hcs/hid TODO,1.11,1.12 hid_graph.pd,1.4,1.5 hid_rel2abs-help.pd,1.1,1.2
by Hans-Christoph Steiner 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29636 Modified Files: TODO hid_graph.pd hid_rel2abs-help.pd Log Message: some minor cleanups Index: hid_graph.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_graph.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** hid_graph.pd 28 Nov 2004 23:57:26 -0000 1.4 --- hid_graph.pd 16 Dec 2004 04:42:27 -0000 1.5 *************** *** 1,17 **** ! #N canvas 461 501 498 334 10; #X obj 20 178 inlet; ! #N canvas 0 22 458 308 graph5 0; #X array \$0-hid_graph_array 100 float 2; #X coords 0 1 100 0 100 100 1; #X restore 2 46 graph; ! #X obj 20 284 outlet; ! #X text 60 217 gives a range of 0-100; ! #X text 67 285 output range 0 to 1; ! #X obj 20 239 tabread \$0-hid_graph_array; #X text -4 157 [hid_graph]; ! #X obj 20 216 * 100; #X text 60 180 input range: 0 to 1; ! #X connect 0 0 7 0; #X connect 5 0 2 0; #X connect 7 0 5 0; #X coords 0 0 1 1 120 120 1; --- 1,43 ---- ! #N canvas 161 50 507 536 10; #X obj 20 178 inlet; ! #N canvas 0 22 462 312 graph5 0; #X array \$0-hid_graph_array 100 float 2; #X coords 0 1 100 0 100 100 1; #X restore 2 46 graph; ! #X obj 115 368 outlet; ! #X text 155 301 gives a range of 0-100; ! #X text 162 369 output range 0 to 1; ! #X obj 115 323 tabread \$0-hid_graph_array; #X text -4 157 [hid_graph]; ! #X obj 115 300 * 100; #X text 60 180 input range: 0 to 1; ! #X obj 20 227 route reset; ! #X obj -8 370 f; ! #X obj -38 370 +; ! #X msg 6 338 0; ! #X msg -38 338 1; ! #X obj -38 454 / 100; ! #X obj -38 431 trigger f f; ! #X obj -38 486 tabwrite \$0-hid_graph_array; ! #X floatatom 34 460 5 0 0 0 - - -; ! #X obj -62 312 until 100; ! #X obj -62 288 trigger bang bang; ! #X connect 0 0 9 0; #X connect 5 0 2 0; #X connect 7 0 5 0; + #X connect 9 0 19 0; + #X connect 9 1 7 0; + #X connect 10 0 11 1; + #X connect 11 0 15 0; + #X connect 11 0 10 0; + #X connect 12 0 10 1; + #X connect 12 0 11 1; + #X connect 13 0 11 0; + #X connect 14 0 16 0; + #X connect 15 0 14 0; + #X connect 15 1 16 1; + #X connect 15 1 17 0; + #X connect 18 0 13 0; + #X connect 19 0 18 0; + #X connect 19 1 12 0; #X coords 0 0 1 1 120 120 1; Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/TODO,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TODO 28 Nov 2004 02:54:54 -0000 1.11 --- TODO 16 Dec 2004 04:42:27 -0000 1.12 *************** *** 1,4 **** --- 1,16 ---- ============================================================================== + = check out GDAM HID implementation + + - GDAM has a HID Manager implementation and probably a Linux one too + + ============================================================================== + = profile [hid] object and usage + + - find out how much more CPU the names (btn_?, abs, rel, etc) use over using + just floats. + + + ============================================================================== = define generic event timestamp struct (probably Pd-ized input_event ) *************** *** 86,89 **** --- 98,118 ---- + ============================================================================== + = mapping object ideas + + [hid2midi] [midi2hid] + + midi value + bend <-> hid + - use MIDI pitch and bend data for values in between MIDI notes? + + object for Fletcher-Munson Equal-loudness contours + + median average object + + non-linear one-to-many mapping object (one curve spans the whole range of the + movement, the other curve kicks in at a specifable point. Arguments could be + start-point and start-value. + + /++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ *************** *** 127,128 **** --- 156,167 ---- I am pretty sure this is just a hid_print_element_list() display problem. + + ______________________________________________________________________________ + - BUG: multiple instances pointing to the same device don't have seperate close/free + + - closing the device on one instance closing that same device on all other + instances of [hid] + + - deleting that instance also closes the device for all other instances + pointing to that same device + Index: hid_rel2abs-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_rel2abs-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hid_rel2abs-help.pd 28 Nov 2004 04:59:47 -0000 1.1 --- hid_rel2abs-help.pd 16 Dec 2004 04:42:27 -0000 1.2 *************** *** 1,3 **** ! #N canvas 593 306 465 308 10; #X obj 5 2 cnv 15 450 20 empty empty [hid_invert] 2 11 1 18 -233017 -66577 0; --- 1,3 ---- ! #N canvas 435 259 469 312 10; #X obj 5 2 cnv 15 450 20 empty empty [hid_invert] 2 11 1 18 -233017 -66577 0; *************** *** 8,22 **** #X text 30 38 Converts relative axis data into an absolute position. ; ! #X obj 205 125 mouse; ! #X msg 223 82 open 1; ! #X msg 234 100 open 2; ! #X obj 187 84 tgl 25 0 empty empty empty 0 -6 0 8 -24198 -1 -1 1 1 ; ! #X floatatom 142 216 5 0 0 0 - - -; ! #X floatatom 183 216 5 0 0 0 - - -; ! #X floatatom 282 217 5 0 0 0 - - -; ! #X floatatom 241 217 5 0 0 0 - - -; ! #X obj 282 183 hid_rel2abs 0 100; ! #X obj 103 184 hid_rel2abs -10 10; #X connect 5 0 10 0; #X connect 5 0 14 0; --- 8,26 ---- #X text 30 38 Converts relative axis data into an absolute position. ; ! #X obj 175 116 mouse; ! #X msg 193 73 open 1; ! #X msg 204 91 open 2; ! #X obj 157 75 tgl 25 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 1 ; ! #X floatatom 112 207 5 0 0 0 - - -; ! #X floatatom 153 207 5 0 0 0 - - -; ! #X floatatom 252 208 5 0 0 0 - - -; ! #X floatatom 211 208 5 0 0 0 - - -; ! #X obj 252 174 hid_rel2abs 0 100; ! #X obj 73 175 hid_rel2abs -10 10; ! #X text 98 240 For more info:; ! #X obj 202 238 all_about_hid_mapping; ! #X msg 73 129 reset; ! #X msg 284 129 reset; #X connect 5 0 10 0; #X connect 5 0 14 0; *************** *** 28,29 **** --- 32,35 ---- #X connect 13 0 11 0; #X connect 14 0 9 0; + #X connect 17 0 14 0; + #X connect 18 0 13 0;

1 0

pd/src m_fifo.c,1.1.2.3,1.1.2.4
by Tim Blechmann 15 Dec '04

15 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13829 Modified Files: Tag: devel_0_38 m_fifo.c Log Message: cas/cas2 optimizing (untested on win32) & cas for ppc (untested, as well) Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** m_fifo.c 11 Dec 2004 10:34:55 -0000 1.1.2.3 --- m_fifo.c 15 Dec 2004 22:05:59 -0000 1.1.2.4 *************** *** 30,48 **** /* gcc on i386 */ ! #define CAS(mem, old, new) \ ! ({ __asm__ __volatile__( \ ! "lock cmpxchg %2,%0 \n" \ ! : : \ ! "m" (*mem), "a" (old), "r" (new) ); \ ! (void*)old != (void*)(*mem); \ }) ! #define CAS2(mem, old1, old2, new1, new2) \ ! ({ __asm__ __volatile__( \ ! "lock cmpxchg8b %0 \n" \ ! : : \ ! "m" (*mem), "a" (old1), "d" (old2), \ ! "b" (new1), "c"(new2)); \ ! (void*) old1 != (void*) (*mem); \ }) --- 30,56 ---- /* gcc on i386 */ ! #define CAS(mem, old, new) \ ! ({ int ret = 0; \ ! __asm__ __volatile__( \ ! "lock cmpxchg %3,%1 \n" \ ! "jnz 1f \n" \ ! "inc %0 \n" \ ! "1: \n" \ ! :"=r"(ret) : \ ! "m" (*mem), "a" (old), "r" (new), "0"(ret) ); \ ! ret; \ }) ! #define CAS2(mem, old1, old2, new1, new2) \ ! ({ int ret = 0; \ ! __asm__ __volatile__( \ ! "lock cmpxchg8b %1 \n" \ ! "jnz 1f \n" \ ! "inc %0 \n" \ ! "1: \n" \ ! :"=r"(ret) : \ ! "m" (*mem), "a" (old1), "d" (old2), \ ! "b" (new1), "c"(new2), "0"(ret)); \ ! ret; \ }) *************** *** 51,56 **** /* msvc on i386 */ ! __inline int CAS(void** mem, void* old, void* new1) { __asm { mov eax, old --- 59,65 ---- /* msvc on i386 */ ! int CAS(void** mem, void* old, void* new1) { + int ret = 0; __asm { mov eax, old *************** *** 58,67 **** mov esi, mem lock cmpxchg dword ptr [esi], ebx ! } ! return ((void*) old != (void*)(*mem)); } ! __inline int CAS2(void** mem, void* old1, unsigned long old2, void* new1, unsigned long new2) { __asm { mov eax, old1 --- 67,80 ---- mov esi, mem lock cmpxchg dword ptr [esi], ebx ! jnz end ! inc [ret] ! end: ! } ! return ret; } ! int CAS2(void** mem, void* old1, unsigned long old2, void* new1, unsigned long new2) { + int ret = 0; __asm { mov eax, old1 *************** *** 71,78 **** mov esi, mem lock cmpxchg8b qword ptr [esi] ! } ! return ((void*) old1 != (void*)(*mem)); } #else --- 84,116 ---- mov esi, mem lock cmpxchg8b qword ptr [esi] ! jnz end ! inc [ret] ! end: ! } ! return ret; } + #elif defined(__POWERPC__) + + /* gcc on ppc */ \ + #define CAS(mem, old, new) \ + ({ __typeof__(old) tmp; \ + int ret = 0; \ + __asm__ __volatile__( \ + "1: \n" \ + "lwarx %0,0,%2 \n" \ + "cmpw %0,%3 \n" \ + "bne 1f \n" \ + "stwcx %0,0,%4 \n" \ + "bne 1b \n" \ + "li %1,1 \n" \ + "1: \n" \ + :"=&r"(tmp), "=r"(ret) : \ + "m" (*mem), "r" (old), "r" (new) ); \ + ret; \ + }) + + #error CAS2 hasn't been implemented for ppc, yet + #else *************** *** 235,239 **** } ! /* fifo_put() and fifo_get are the only threadsafe functions!!! */ void fifo_put(t_fifo* fifo, void* data) { --- 273,277 ---- } ! /* fifo_put and fifo_get are the only threadsafe functions!!! */ void fifo_put(t_fifo* fifo, void* data) {

1 0

pd/src s_audio.c,1.5.4.3,1.5.4.4 s_file.c,1.2.4.5,1.2.4.6
by Thomas Grill 14 Dec '04

14 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31156/src Modified Files: Tag: devel_0_38 s_audio.c s_file.c Log Message: fixed scheduler mode settings Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.3 retrieving revision 1.5.4.4 diff -C2 -d -r1.5.4.3 -r1.5.4.4 *** s_audio.c 14 Dec 2004 09:45:21 -0000 1.5.4.3 --- s_audio.c 14 Dec 2004 15:56:43 -0000 1.5.4.4 *************** *** 366,370 **** if (sys_audioapi == API_ASIO) asio_open_audio(naudioindev, audioindev, nchindev, chindev, ! naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, scheduler); else #endif --- 366,370 ---- if (sys_audioapi == API_ASIO) asio_open_audio(naudioindev, audioindev, nchindev, chindev, ! naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, schedmode); else #endif Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.5 retrieving revision 1.2.4.6 diff -C2 -d -r1.2.4.5 -r1.2.4.6 *** s_file.c 14 Dec 2004 09:49:48 -0000 1.2.4.5 --- s_file.c 14 Dec 2004 15:56:44 -0000 1.2.4.6 *************** *** 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(); --- 264,268 ---- int nmidiindev, midiindev[MAXMIDIINDEV]; int nmidioutdev, midioutdev[MAXMIDIOUTDEV]; ! int i, rate = 0, advance = 0, dacblocksize = 0, api, nolib, scheduler = 0; char prefbuf[MAXPDSTRING], keybuf[80]; sys_initloadpreferences();

1 0

pd/src u_main.tk,1.4.4.5,1.4.4.6
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-serv24185 Modified Files: Tag: devel_0_38 u_main.tk Log Message: make callback scheduler selectable by user & miller's changes to 0.38-test13 Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** u_main.tk 12 Nov 2004 08:21:20 -0000 1.4.4.5 --- u_main.tk 14 Dec 2004 10:06:23 -0000 1.4.4.6 *************** *** 341,348 **** global help_directory global pd_nt if {$pd_nt == 2} { exec rm -rf /tmp/pd-documentation ! exec cp -pr $help_directory /tmp/pd-documentation set filename [tk_getOpenFile -defaultextension .pd \ -filetypes { {{documentation} {.pd .txt .htm}} } \ --- 341,349 ---- global help_directory global pd_nt + global pd_guidir if {$pd_nt == 2} { exec rm -rf /tmp/pd-documentation ! exec cp -pr $pd_guidir/doc /tmp/pd-documentation set filename [tk_getOpenFile -defaultextension .pd \ -filetypes { {{documentation} {.pd .txt .htm}} } \ *************** *** 869,905 **** $name.m.put add command -label Bang \ -command [concat menu_bng $name 0] \ ! -accelerator [accel_munge "Alt+b"] $name.m.put add command -label Toggle \ -command [concat menu_toggle $name 0] \ ! -accelerator [accel_munge "Alt+t"] $name.m.put add command -label Number2 \ -command [concat menu_numbox $name 0] \ ! -accelerator [accel_munge "Alt+n"] $name.m.put add command -label Vslider \ -command [concat menu_vslider $name 0] \ ! -accelerator [accel_munge "Alt+v"] $name.m.put add command -label Hslider \ -command [concat menu_hslider $name 0] \ ! -accelerator [accel_munge "Alt+h"] $name.m.put add command -label Vradio \ -command [concat menu_vradio $name 0] \ ! -accelerator [accel_munge "Alt+d"] $name.m.put add command -label Hradio \ -command [concat menu_hradio $name 0] \ ! -accelerator [accel_munge "Alt+i"] $name.m.put add command -label VU \ -command [concat menu_vumeter $name 0] \ ! -accelerator [accel_munge "Alt+u"] $name.m.put add command -label Canvas \ -command [concat menu_mycnv $name 0] \ ! -accelerator [accel_munge "Alt+c"] ############iemlib################## --- 870,906 ---- $name.m.put add command -label Bang \ -command [concat menu_bng $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+b"] $name.m.put add command -label Toggle \ -command [concat menu_toggle $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+t"] $name.m.put add command -label Number2 \ -command [concat menu_numbox $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+n"] $name.m.put add command -label Vslider \ -command [concat menu_vslider $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+v"] $name.m.put add command -label Hslider \ -command [concat menu_hslider $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+h"] $name.m.put add command -label Vradio \ -command [concat menu_vradio $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+d"] $name.m.put add command -label Hradio \ -command [concat menu_hradio $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+i"] $name.m.put add command -label VU \ -command [concat menu_vumeter $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+u"] $name.m.put add command -label Canvas \ -command [concat menu_mycnv $name 0] \ ! -accelerator [accel_munge "Shift+Ctrl+c"] ############iemlib################## *************** *** 1009,1017 **** bind $name.c <Control-Key> {pdtk_canvas_ctrlkey %W %K 0} bind $name.c <Control-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} - if {$pd_nt == 2} { - bind $name.c <Option-Key> {pdtk_canvas_altkey %W %K %A} - } else { - bind $name.c <Alt-Key> {pdtk_canvas_altkey %W %K %A} - } # bind $name.c <Mod1-Key> {puts stderr [concat mod1 %W %K %A]} if {$pd_nt == 2} { --- 1010,1013 ---- *************** *** 1173,1180 **** } ! proc pdtk_canvas_altkey {name key iso} { ! # puts stderr [concat alt-key $iso] ! ############iemlib################## set topname [string trimright $name .c] if {$key == "b" || $key == "B"} {menu_bng $topname 1} if {$key == "t" || $key == "T"} {menu_toggle $topname 1} --- 1169,1188 ---- } ! proc pdtk_canvas_ctrlkey {name key shift} { ! # first get rid of ".c" suffix; we'll refer to the toplevel instead set topname [string trimright $name .c] + # puts stderr [concat ctrl-key $key $topname] + + if {$key == "1"} {menu_object $topname 1} + if {$key == "2"} {menu_message $topname 1} + if {$key == "3"} {menu_floatatom $topname 1} + if {$key == "4"} {menu_symbolatom $topname 1} + if {$key == "5"} {menu_comment $topname 1} + if {$key == "slash"} {menu_audio 1} + if {$key == "period"} {menu_audio 0} + if {$shift == 1} { + if {$key == "q" || $key == "Q"} {menu_really_quit} + if {$key == "s" || $key == "S"} {menu_saveas $topname} + if {$key == "z" || $key == "Z"} {menu_redo $topname} if {$key == "b" || $key == "B"} {menu_bng $topname 1} if {$key == "t" || $key == "T"} {menu_toggle $topname 1} *************** *** 1186,1209 **** if {$key == "u" || $key == "U"} {menu_vumeter $topname 1} if {$key == "c" || $key == "C"} {menu_mycnv $topname 1} ! ############iemlib################## ! } ! ! proc pdtk_canvas_ctrlkey {name key shift} { ! # first get rid of ".c" suffix; we'll refer to the toplevel instead ! set topname [string trimright $name .c] ! # puts stderr [concat ctrl-key $key $topname] ! if {$key == "n" || $key == "N"} {menu_new} if {$key == "o" || $key == "O"} {menu_open} if {$key == "m" || $key == "M"} {menu_send} - if {$key == "q" || $key == "Q"} { - if {$shift == 1} {menu_really_quit} else {menu_quit} - } - if {$key == "s" || $key == "S"} { - if {$shift == 1} {menu_saveas $topname} else {menu_save $topname} - } - if {$key == "z" || $key == "Z"} { - if {$shift == 1} {menu_redo $topname} else {menu_undo $topname} - } if {$key == "w" || $key == "W"} {menu_close $topname} if {$key == "p" || $key == "P"} {menu_print $topname} --- 1194,1205 ---- if {$key == "u" || $key == "U"} {menu_vumeter $topname 1} if {$key == "c" || $key == "C"} {menu_mycnv $topname 1} ! } else { ! if {$key == "e" || $key == "E"} {menu_editmode $topname} ! if {$key == "q" || $key == "Q"} {menu_quit} ! if {$key == "s" || $key == "S"} {menu_save $topname} ! if {$key == "z" || $key == "Z"} {menu_undo $topname} if {$key == "n" || $key == "N"} {menu_new} if {$key == "o" || $key == "O"} {menu_open} if {$key == "m" || $key == "M"} {menu_send} if {$key == "w" || $key == "W"} {menu_close $topname} if {$key == "p" || $key == "P"} {menu_print $topname} *************** *** 1216,1227 **** if {$key == "f" || $key == "F"} {menu_findobject $topname} if {$key == "g" || $key == "G"} {menu_findagain $topname} ! if {$key == "1"} {menu_object $topname 1} ! if {$key == "2"} {menu_message $topname 1} ! if {$key == "3"} {menu_floatatom $topname 1} ! if {$key == "4"} {menu_symbolatom $topname 1} ! if {$key == "5"} {menu_comment $topname 1} ! if {$key == "slash"} {menu_audio 1} ! if {$key == "period"} {menu_audio 0} ! if {$key == "e" || $key == "E"} {menu_editmode $topname} } --- 1212,1216 ---- if {$key == "f" || $key == "F"} {menu_findobject $topname} if {$key == "g" || $key == "G"} {menu_findagain $topname} ! } } *************** *** 2990,2994 **** global audio_outchan1 audio_outchan2 audio_outchan3 audio_outchan4 global audio_outenable1 audio_outenable2 audio_outenable3 audio_outenable4 ! global audio_sr audio_dacblocksize audio_advance pd [concat pd audio-dialog \ --- 2979,2983 ---- global audio_outchan1 audio_outchan2 audio_outchan3 audio_outchan4 global audio_outenable1 audio_outenable2 audio_outenable3 audio_outenable4 ! global audio_sr audio_dacblocksize audio_advance audio_scheduler pd [concat pd audio-dialog \ *************** *** 3012,3015 **** --- 3001,3005 ---- $audio_dacblocksize \ $audio_advance \ + $audio_scheduler \ \;] } *************** *** 3062,3068 **** global audio_outchan1 audio_outchan2 audio_outchan3 audio_outchan4 global audio_outenable1 audio_outenable2 audio_outenable3 audio_outenable4 ! global audio_sr audio_dacblocksize audio_advance global audio_indevlist audio_outdevlist set audio_indev1 $indev1 set audio_indev2 $indev2 --- 3052,3060 ---- global audio_outchan1 audio_outchan2 audio_outchan3 audio_outchan4 global audio_outenable1 audio_outenable2 audio_outenable3 audio_outenable4 ! global audio_sr audio_dacblocksize audio_advance audio_scheduler global audio_indevlist audio_outdevlist + global pd_apilist + set audio_indev1 $indev1 set audio_indev2 $indev2 *************** *** 3125,3129 **** label $id.srf.l3 -text "dacblocksize:" entry $id.srf.x3 -textvariable audio_dacblocksize -width 4 ! pack $id.srf.l1 $id.srf.x1 $id.srf.l2 $id.srf.x2 $id.srf.l3 $id.srf.x3 -side left # input device 1 --- 3117,3131 ---- label $id.srf.l3 -text "dacblocksize:" entry $id.srf.x3 -textvariable audio_dacblocksize -width 4 ! ! # puts stderr [concat pd_apilist $pd_apilist] ! ! if { {lsearch $pd_apilist 7} != -1 } { ! label $id.srf.l4 -text "cb scheduler:" ! checkbutton $id.srf.x4 -variable audio_scheduler ! pack $id.srf.l1 $id.srf.x1 $id.srf.l2 $id.srf.x2 $id.srf.l3 $id.srf.x3 $id.srf.l4 $id.srf.x4 -side left ! } else { ! pack $id.srf.l1 $id.srf.x1 $id.srf.l2 $id.srf.x2 $id.srf.l3 $id.srf.x3 -side left ! } ! # input device 1

1 0

pd/src s_stuff.h,1.5.4.3,1.5.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-serv23528 Modified Files: Tag: devel_0_38 s_stuff.h Log Message: make callback scheduler selectable by user Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.3 retrieving revision 1.5.4.4 diff -C2 -d -r1.5.4.3 -r1.5.4.4 *** s_stuff.h 10 Nov 2004 18:29:50 -0000 1.5.4.3 --- s_stuff.h 14 Dec 2004 10:02:14 -0000 1.5.4.4 *************** *** 81,85 **** int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev, ! int srate, int dacblocksize, int advance, int enable); void sys_reopen_audio( void); void sys_close_audio(void); --- 81,85 ---- 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); *************** *** 247,251 **** void asio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, ! int nchoutdev, int *choutdev, int srate); void asio_close_audio(void); void asio_getdevs(char *indevlist, int *nindevs, --- 247,251 ---- void asio_open_audio(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, ! int nchoutdev, int *choutdev, int srate, int scheduler); void asio_close_audio(void); void asio_getdevs(char *indevlist, int *nindevs, *************** *** 267,271 **** int *pnaudioindev, int *paudioindev, int *chindev, int *pnaudiooutdev, int *paudiooutdev, int *choutdev, ! int *prate, int *dacblocksize, int *padvance); void sys_save_audio_params( int naudioindev, int *audioindev, int *chindev, --- 267,271 ---- int *pnaudioindev, int *paudioindev, int *chindev, int *pnaudiooutdev, int *paudiooutdev, int *choutdev, ! int *prate, int *dacblocksize, int *padvance, int *pscheduler); void sys_save_audio_params( int naudioindev, int *audioindev, int *chindev,

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
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