Pd-cvs November 2003

pd-cvs@lists.iem.at

5 participants
91 discussions

externals/build/src linuxevent.c,1.2,1.3 linuxjoystick.c,1.2,1.3 linuxmouse.c,1.2,1.3
by eighthave＠users.sourceforge.net 17 Nov '03

17 Nov '03

Update of /cvsroot/pure-data/externals/build/src In directory sc8-pr-cvs1:/tmp/cvs-serv19164 Modified Files: linuxevent.c linuxjoystick.c linuxmouse.c Log Message: updated #ifdef LINUX to #ifdef __linux__ Index: linuxevent.c =================================================================== RCS file: /cvsroot/pure-data/externals/build/src/linuxevent.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** linuxevent.c 31 Aug 2003 14:43:34 -0000 1.2 --- linuxevent.c 17 Nov 2003 17:12:56 -0000 1.3 *************** *** 1,3 **** ! #ifdef LINUX #include "../../hcs/linuxevent.c" #endif --- 1,3 ---- ! #ifdef __linux__ #include "../../hcs/linuxevent.c" #endif Index: linuxjoystick.c =================================================================== RCS file: /cvsroot/pure-data/externals/build/src/linuxjoystick.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** linuxjoystick.c 31 Aug 2003 14:43:34 -0000 1.2 --- linuxjoystick.c 17 Nov 2003 17:12:56 -0000 1.3 *************** *** 1,3 **** ! #ifdef LINUX #include "../../hcs/linuxjoystick.c" #endif --- 1,3 ---- ! #ifdef __linux__ #include "../../hcs/linuxjoystick.c" #endif Index: linuxmouse.c =================================================================== RCS file: /cvsroot/pure-data/externals/build/src/linuxmouse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** linuxmouse.c 31 Aug 2003 14:43:34 -0000 1.2 --- linuxmouse.c 17 Nov 2003 17:12:56 -0000 1.3 *************** *** 1,3 **** ! #ifdef LINUX #include "../../hcs/linuxmouse.c" #endif --- 1,3 ---- ! #ifdef __linux__ #include "../../hcs/linuxmouse.c" #endif

1 0

externals/hcs ifeel-help.pd,NONE,1.1 help-ifeel.pd,1.1,NONE
by eighthave＠users.sourceforge.net 17 Nov '03

17 Nov '03

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1:/tmp/cvs-serv27186 Added Files: ifeel-help.pd Removed Files: help-ifeel.pd Log Message: moved helpfiles to 0.37 style --- NEW FILE: ifeel-help.pd --- #N canvas 736 320 450 300 10; #X obj 105 228 ifeel /dev/input/ifeel0; #X obj 160 82 hsl 128 20 0 255 0 0 empty empty interval_(0-255) 6 8 32 8 -225271 -1 -1 12700 0; #X obj 212 130 hsl 128 20 0 255 0 0 empty empty count_(0-255) 6 8 32 8 -261681 -1 -1 0 0; #X obj 264 178 hsl 128 20 0 1 0 0 empty empty level_(0-1) 6 8 32 8 -261689 -1 -1 12700 0; #X obj 61 157 bng 25 250 50 0 empty empty empty 0 -6 32 8 -24198 -1 -1; #X obj 105 157 bng 25 250 50 0 empty empty empty 0 -6 32 8 -258699 -1 -1; #X msg 105 187 stop; #X msg 61 187 start; #X obj 261 201 nbx 5 14 -1e+37 1e+37 0 0 pack_bang_env empty empty 0 -6 33 10 -233017 -1 -1 1 256; #X obj 209 153 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty 0 -6 33 10 -233017 -1 -1 0 256; #X obj 157 105 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty 0 -6 33 10 -233017 -1 -1 255 256; #X obj 120 9 cnv 15 20 20 empty empty ifeel 4 12 33 14 -228992 -66577 0; #X text 190 15 control the pulse in an iFeel mouse; #X obj 4 13 force-feedback; #X connect 1 0 10 0; #X connect 2 0 9 0; #X connect 3 0 8 0; #X connect 4 0 7 0; #X connect 5 0 6 0; #X connect 6 0 0 0; #X connect 7 0 0 0; #X connect 8 0 0 3; #X connect 9 0 0 2; #X connect 10 0 0 1; --- help-ifeel.pd DELETED ---

1 0

externals/hcs linuxevent-joystick.pd,NONE,1.1 linuxevent.c,1.2,1.3 linuxevent-help.pd,1.1,1.2
by eighthave＠users.sourceforge.net 17 Nov '03

17 Nov '03

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1:/tmp/cvs-serv26238 Modified Files: linuxevent.c linuxevent-help.pd Added Files: linuxevent-joystick.pd Log Message: fixed [linuxevent] and added help files --- NEW FILE: linuxevent-joystick.pd --- #N canvas 270 365 499 362 10; #X obj 16 86 linuxevent /dev/input/event1; #X msg 35 43 start; #X msg 44 62 stop; #X obj 16 9 inlet; #X obj 79 116 pack f f f; #X obj 79 139 route 1 3; #X obj 137 159 print UNKNOWN_JOYSTICK_EVENT_TYPE; #X text 148 139 types (1=buttons 3=abs axes); #X obj 108 187 route 0 1 6 7; #X obj 194 209 print UNKNOWN_JOYSTICK_EVENT_CODE; #X obj 151 249 print THROTTLE; #X text 204 190 codes (0=X 1=Y 6=throttle 7=rudder); #X obj 172 229 print RUDDER; #X obj 129 269 print Y-AXIS; #X obj 108 290 print X-AXIS; #X connect 0 1 4 0; #X connect 0 2 4 1; #X connect 0 3 4 2; #X connect 1 0 0 0; #X connect 2 0 0 0; #X connect 3 0 0 0; #X connect 4 0 5 0; #X connect 5 1 8 0; #X connect 5 2 6 0; #X connect 8 0 14 0; #X connect 8 1 13 0; #X connect 8 2 10 0; #X connect 8 3 12 0; Index: linuxevent.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/linuxevent.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** linuxevent.c 25 Apr 2003 23:42:19 -0000 1.2 --- linuxevent.c 17 Nov 2003 06:18:23 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- t_int x_fd; t_symbol* x_devname; + t_clock *x_clock; int read_ok; int started; *************** *** 22,25 **** --- 23,27 ---- t_outlet *x_input_event_code_outlet; t_outlet *x_input_event_value_outlet; + int x_delaytime; }t_linuxevent; *************** *** 31,41 **** static int linuxevent_close(t_linuxevent *x) { ! DEBUG(post("linuxevent_close");) ! ! if (x->x_fd <0) return 0; ! ! close (x->x_fd); ! ! return 1; } --- 33,44 ---- static int linuxevent_close(t_linuxevent *x) { ! DEBUG(post("linuxevent_close");) ! ! if (x->x_fd <0) { ! return 0; ! } else { ! close (x->x_fd); ! return 1; ! } } *************** *** 158,181 **** static int linuxevent_read(t_linuxevent *x,int fd) { ! int readBytes; ! int axis_num = 0; ! t_float button_num = 0; if (x->x_fd < 0) return 0; ! if (x->read_ok) { ! readBytes = read(x->x_fd, &(x->x_input_event), sizeof(struct input_event)); ! DEBUG(post("reading %d",readBytes);) ! if ( readBytes < 0 ) { ! post("linuxevent: read failed"); ! x->read_ok = 0; ! return 0; ! } } - /* input_event.time is a timeval struct from <sys/time.h> */ - /* outlet_float (x->x_input_event_time_outlet, x->x_input_event.time); */ - outlet_float (x->x_input_event_type_outlet, x->x_input_event.type); - outlet_float (x->x_input_event_code_outlet, x->x_input_event.code); - outlet_float (x->x_input_event_value_outlet, (int)x->x_input_event.value); return 1; } --- 161,180 ---- static int linuxevent_read(t_linuxevent *x,int fd) { ! // int readBytes; if (x->x_fd < 0) return 0; ! ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) { ! outlet_float (x->x_input_event_value_outlet, (int)x->x_input_event.value); ! outlet_float (x->x_input_event_code_outlet, x->x_input_event.code); ! outlet_float (x->x_input_event_type_outlet, x->x_input_event.type); ! /* input_event.time is a timeval struct from <sys/time.h> */ ! /* outlet_float (x->x_input_event_time_outlet, x->x_input_event.time); */ } + if (x->started) { + clock_delay(x->x_clock, x->x_delaytime); + } + return 1; } *************** *** 183,192 **** /* Actions */ - static void linuxevent_bang(t_linuxevent* x) - { - DEBUG(post("linuxevent_bang");) - - } - static void linuxevent_float(t_linuxevent* x) { --- 182,185 ---- *************** *** 195,208 **** } // DONE void linuxevent_start(t_linuxevent* x) { ! DEBUG(post("linuxevent_start");) ! ! if (x->x_fd >= 0 && !x->started) { ! sys_addpollfn(x->x_fd, (t_fdpollfn)linuxevent_read, x); ! post("linuxevent: start"); ! x->started = 1; ! } } --- 188,213 ---- } + void linuxevent_delay(t_linuxevent* x, t_float f) { + DEBUG(post("linuxevent_DELAY %f",f);) + + /* if the user sets the delay less than zero, reset to default */ + if ( f > 0 ) { + x->x_delaytime = (int)f; + } else { + x->x_delaytime = 5; + } + } + // DONE void linuxevent_start(t_linuxevent* x) { ! DEBUG(post("linuxevent_start");); ! post("clock delay: %d",x->x_delaytime); ! ! if (x->x_fd >= 0 && !x->started) { ! clock_delay(x->x_clock, 2); ! post("linuxevent: start"); ! x->started = 1; ! } } *************** *** 211,221 **** void linuxevent_stop(t_linuxevent* x) { ! DEBUG(post("linuxevent_stop");) ! ! if (x->x_fd >= 0 && x->started) { ! sys_rmpollfn(x->x_fd); ! post("linuxevent: stop"); ! x->started = 0; ! } } --- 216,228 ---- void linuxevent_stop(t_linuxevent* x) { ! DEBUG(post("linuxevent_stop");); ! ! post("clock delay: %d",x->x_delaytime); ! ! if (x->x_fd >= 0 && x->started) { ! clock_unset(x->x_clock); ! post("linuxevent: stop"); ! x->started = 0; ! } } *************** *** 227,234 **** DEBUG(post("linuxevent_free");) ! if (x->x_fd < 0) return; ! linuxevent_stop(x); ! close (x->x_fd); } --- 234,241 ---- DEBUG(post("linuxevent_free");) ! if (x->x_fd < 0) return; ! linuxevent_stop(x); ! clock_free(x->x_clock); close (x->x_fd); } *************** *** 240,248 **** DEBUG(post("linuxevent_new");) ! /* init vars */ x->x_fd = -1; x->read_ok = 1; x->started = 0; /* create outlets for each axis */ --- 247,260 ---- DEBUG(post("linuxevent_new");) ! ! post("[linuxevent] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); ! /* init vars */ x->x_fd = -1; x->read_ok = 1; x->started = 0; + x->x_delaytime = 5; + + x->x_clock = clock_new(x, (t_method)linuxevent_read); /* create outlets for each axis */ *************** *** 273,277 **** /* add inlet datatype methods */ class_addfloat(linuxevent_class,(t_method) linuxevent_float); ! class_addbang(linuxevent_class,(t_method) linuxevent_bang); /* add inlet message methods */ --- 285,289 ---- /* add inlet datatype methods */ class_addfloat(linuxevent_class,(t_method) linuxevent_float); ! class_addbang(linuxevent_class,(t_method) linuxevent_read); /* add inlet message methods */ *************** *** 280,283 **** --- 292,296 ---- class_addmethod(linuxevent_class,(t_method) linuxevent_start,gensym("start"),0); class_addmethod(linuxevent_class,(t_method) linuxevent_stop,gensym("stop"),0); + class_addmethod(linuxevent_class,(t_method) linuxevent_delay,gensym("delay"),A_FLOAT,0); } Index: linuxevent-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/linuxevent-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** linuxevent-help.pd 17 Nov 2003 03:04:55 -0000 1.1 --- linuxevent-help.pd 17 Nov 2003 06:18:23 -0000 1.2 *************** *** 1,20 **** ! #N canvas 454 205 450 300 10; ! #X floatatom 254 231 5 0 0 3 code - -; ! #X floatatom 318 231 5 0 0 3 value - -; ! #X floatatom 190 231 4 0 0 3 type - -; ! #X floatatom 117 231 9 0 0 3 time - -; ! #X msg 177 104 start; ! #X msg 178 126 stop; ! #X obj 127 208 linuxevent /dev/input/event0; ! #X obj 127 63 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X text 147 63 bang to get an update; ! #X text 225 116 start/stop polling; ! #X obj 52 67 metro 20; ! #X msg 182 165 delay 20; ! #X text 249 165 time between polls (ms); ! #X obj 51 35 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 75 39 stop; #X connect 4 0 6 0; #X connect 5 0 6 0; --- 1,186 ---- ! #N canvas 547 51 569 453 10; ! #X floatatom 241 326 5 0 0 3 code - -; ! #X floatatom 305 326 5 0 0 3 value - -; ! #X floatatom 177 326 4 0 0 3 type - -; ! #X floatatom 104 326 9 0 0 3 time - -; ! #X msg 164 199 start; ! #X msg 165 221 stop; ! #X obj 114 303 linuxevent /dev/input/event0; ! #X obj 114 158 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X text 134 158 bang to get an update; ! #X text 212 211 start/stop polling; ! #X obj 25 158 metro 20; ! #X text 236 260 time between polls (ms); ! #X obj 25 136 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 45 136 stop; ! #X msg 169 260 delay 20; ! #X obj 114 109 key; ! #X obj 114 129 select 98; ! #X text 187 129 <- type 'b' for a bang; ! #N canvas 278 328 611 524 Event_Codes 0; ! #X text 28 48 (For a complete listing of Linux Input Events \, see ! /usr/include/linux/input.h.); ! #X obj 11 9 cnv 15 580 30 empty empty Event_Codes 20 12 1 14 -225271 ! -66577 0; ! #X text 32 118 EVENT CODE; ! #X text 162 118 #define; ! #X text 232 118 number; ! #X text 32 133 -----------------------------------; ! #X text 32 148 X Axis; ! #X text 32 163 Y Axis; ! #X text 32 178 Z Axis; ! #X text 32 193 Horizontal Wheel; ! #X text 32 208 Dial; ! #X text 32 223 Wheel; ! #X text 32 238 Misc; ! #X text 162 148 REL_X; ! #X text 162 163 REL_Y; ! #X text 162 178 REL_Z; ! #X text 162 193 REL_HWHEEL; ! #X text 162 208 REL_DIAL; ! #X text 162 223 REL_WHEEL; ! #X text 162 238 REL_MISC; ! #X text 232 148 0; ! #X text 232 163 1; ! #X text 232 178 2; ! #X text 232 193 6; ! #X text 232 208 7; ! #X text 232 223 8; ! #X text 232 238 9; ! #X text 307 118 EVENT CODE; ! #X text 457 118 #define; ! #X text 547 118 number; ! #X text 307 148 Absolute X; ! #X text 307 163 Absolute Y; ! #X text 307 178 Absolute Z; ! #X text 307 193 RX; ! #X text 307 208 RY; ! #X text 307 223 RZ; ! #X text 307 238 Throttle; ! #X text 307 253 Rudder; ! #X text 307 268 Wheel; ! #X text 307 283 Gas Pedal; ! #X text 307 298 Brake Pedal; ! #X text 307 313 Hat Switch 0 X-axis; ! #X text 307 328 Hat Switch 0 Y-axis; ! #X text 307 343 Hat Switch 1 X-axis; ! #X text 307 358 Hat Switch 1 Y-axis; ! #X text 307 373 Hat Switch 2 X-axis; ! #X text 307 388 Hat Switch 2 Y-axis; ! #X text 307 403 Hat Switch 3 X-axis; ! #X text 307 418 Hat Switch 3 Y-axis; ! #X text 307 433 Pressure; ! #X text 307 448 Distance; ! #X text 307 463 Tilt X-Axis; ! #X text 307 478 Tilt Y-Axis; ! #X text 307 493 Misc; ! #X text 457 148 ABS_X; ! #X text 457 163 ABS_Y; ! #X text 457 178 ABS_Z; ! #X text 457 193 ABS_RX; ! #X text 457 208 ABS_RY; ! #X text 457 223 ABS_RZ; ! #X text 457 238 ABS_THROTTLE; ! #X text 457 253 ABS_RUDDER; ! #X text 457 268 ABS_WHEEL; ! #X text 457 283 ABS_GAS; ! #X text 457 298 ABS_BRAKE; ! #X text 457 313 ABS_HAT0X; ! #X text 457 328 ABS_HAT0Y; ! #X text 457 343 ABS_HAT1X; ! #X text 457 358 ABS_HAT1Y; ! #X text 457 373 ABS_HAT2X; ! #X text 457 388 ABS_HAT2Y; ! #X text 457 403 ABS_HAT3X; ! #X text 457 418 ABS_HAT3Y; ! #X text 457 433 ABS_PRESSURE; ! #X text 457 448 ABS_DISTANCE; ! #X text 457 463 ABS_TILT_X; ! #X text 457 478 ABS_TILT_Y; ! #X text 457 493 ABS_MISC; ! #X text 547 148 0; ! #X text 547 163 1; ! #X text 547 178 2; ! #X text 547 193 3; ! #X text 547 208 4; ! #X text 547 223 5; ! #X text 547 238 6; ! #X text 547 253 7; ! #X text 547 268 8; ! #X text 547 283 9; ! #X text 547 298 10; ! #X text 547 313 16; ! #X text 547 328 17; ! #X text 547 343 18; ! #X text 547 358 19; ! #X text 547 373 20; ! #X text 547 388 21; ! #X text 547 403 22; ! #X text 547 418 23; ! #X text 547 433 24; ! #X text 547 448 25; ! #X text 547 463 26; ! #X text 547 478 27; ! #X text 547 493 28; ! #X obj 30 89 cnv 15 250 25 empty empty Relative_Axes 20 12 1 12 -241660 ! -66577 0; ! #X obj 308 89 cnv 15 280 25 empty empty Absolute_Axes 20 12 1 12 -241660 ! -66577 0; ! #X text 307 133 ----------------------------------------; ! #X restore 439 368 pd Event_Codes; ! #N canvas 546 568 420 271 Event_Types 0; ! #X text 28 48 (For a complete listing of Linux Input Events \, see ! /usr/include/linux/input.h.); ! #X text 84 94 EVENT TYPE; ! #X text 84 109 -----------------------------------; ! #X text 84 124 RST; ! #X text 84 139 Keys and Buttons; ! #X text 84 154 Relative Axes; ! #X text 84 169 Absolute Axes; ! #X text 84 184 Misc Events; ! #X text 84 199 LED Event; ! #X text 84 214 Sounds; ! #X text 84 229 Autorepeat Values; ! #X text 84 244 Force Feedback; ! #X text 214 94 #define; ! #X text 214 124 EV_RST; ! #X text 214 139 EV_KEY; ! #X text 214 154 EV_REL; ! #X text 214 169 EV_ABS; ! #X text 214 184 EV_MSC; ! #X text 214 199 EV_LED; ! #X text 214 214 EV_SND; ! #X text 214 229 EV_REP; ! #X text 214 244 EV_FF; ! #X text 284 94 number; ! #X text 284 124 0; ! #X text 284 139 1; ! #X text 284 154 2; ! #X text 284 169 3; ! #X text 284 184 4; ! #X text 284 199 17; ! #X text 284 214 18; ! #X text 284 229 20; ! #X text 284 244 21; ! #X obj 11 9 cnv 15 400 30 empty empty Event_Types 20 12 1 14 -262131 ! -66577 0; ! #X restore 439 348 pd Event_Types; ! #N canvas 0 0 450 300 Event_Values 0; ! #X text 28 48 (For a complete listing of Linux Input Events \, see ! /usr/include/linux/input.h.); ! #X obj 11 9 cnv 15 400 30 empty empty Event_Values 20 12 1 14 -261681 ! -66577 0; ! #X restore 439 388 pd Event_Values; ! #X text 8 373 Check the Pd console for supported event types and codes. ! This object will report them when it opens a device.; ! #X obj 9 8 cnv 15 550 30 empty empty linuxevent 20 12 1 16 -228992 ! -66577 0; ! #X text 17 50 [linuxevent] outputs raw events from the Linux Event ! system. It is used for access the output of various Human Interface ! Devices \, like mice \, joysticks \, tablets \, etc.; ! #X text 62 424 Here's an example for using a joystick:; ! #X obj 366 423 linuxevent-joystick; #X connect 4 0 6 0; #X connect 5 0 6 0; *************** *** 25,29 **** #X connect 7 0 6 0; #X connect 10 0 6 0; ! #X connect 11 0 6 0; #X connect 13 0 10 0; ! #X connect 14 0 10 0; --- 191,197 ---- #X connect 7 0 6 0; #X connect 10 0 6 0; ! #X connect 12 0 10 0; #X connect 13 0 10 0; ! #X connect 14 0 6 0; ! #X connect 15 0 16 0; ! #X connect 16 0 7 0;

1 0

externals/grill/fftease fftease.vcproj,1.1,1.2
by xovo＠users.sourceforge.net 17 Nov '03

17 Nov '03

Update of /cvsroot/pure-data/externals/grill/fftease In directory sc8-pr-cvs1:/tmp/cvs-serv4229 Modified Files: fftease.vcproj Log Message: "" Index: fftease.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/fftease/fftease.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fftease.vcproj 13 Jun 2003 02:42:25 -0000 1.1 --- fftease.vcproj 17 Nov 2003 03:41:00 -0000 1.2 *************** *** 146,149 **** --- 146,283 ---- Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> + <Configuration + Name="Max Release|Win32" + OutputDirectory=".\max-msvc/r" + IntermediateDirectory=".\max-msvc/r" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" [...1965 lines suppressed...] --- 3337,3355 ---- AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Max Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Max Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories=""/> </FileConfiguration> </File>

1 0

externals/grill/fftease/maxmsp disarray~.help,1.1,1.2 drown~.help,1.1,1.2
by xovo＠users.sourceforge.net 17 Nov '03

17 Nov '03

Update of /cvsroot/pure-data/externals/grill/fftease/maxmsp In directory sc8-pr-cvs1:/tmp/cvs-serv4229/maxmsp Modified Files: disarray~.help drown~.help Log Message: "" Index: disarray~.help =================================================================== RCS file: /cvsroot/pure-data/externals/grill/fftease/maxmsp/disarray~.help,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs6xWRcC and /tmp/cvsGyGDc4 differ Index: drown~.help =================================================================== RCS file: /cvsroot/pure-data/externals/grill/fftease/maxmsp/drown~.help,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs71xViD and /tmp/cvs4ti7n6 differ

1 0

externals/grill/flext readme.txt,1.43,1.44
by xovo＠users.sourceforge.net 17 Nov '03

17 Nov '03

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1:/tmp/cvs-serv2815 Modified Files: readme.txt Log Message: "" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/readme.txt,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** readme.txt 12 Nov 2003 03:35:18 -0000 1.43 --- readme.txt 17 Nov 2003 03:32:51 -0000 1.44 *************** *** 38,48 **** pd - Windows: ------------- ! o Microsoft Visual C++ 6 or 7: edit "config-pd-msvc.txt" & run "build-pd-msvc.bat" ! o Borland C++ 5.5 (free): edit "config-pd-bcc.txt" & run "build-pd-bcc.bat" o Cygwin: edit "config-pd-cygwin.txt" & run "sh build-pd-cygwin.sh" additional settings (e.g. target processor, compiler flags) can be made in makefile.pd-cygwin With your project using flext, be sure to define "FLEXT_SYS=2". --- 38,54 ---- pd - Windows: ------------- ! o Microsoft Visual C++ 6 or 7: ! edit "config-pd-msvc.txt" ! start a dos-shell (cmd.exe) and set the compiler environment (vcvars32.bat) ! run "build-pd-msvc.bat" ! o Borland C++ 5.5 (free): ! edit "config-pd-bcc.txt" ! run "build-pd-bcc.bat" o Cygwin: edit "config-pd-cygwin.txt" & run "sh build-pd-cygwin.sh" additional settings (e.g. target processor, compiler flags) can be made in makefile.pd-cygwin + With your project using flext, be sure to define "FLEXT_SYS=2". *************** *** 56,59 **** --- 62,66 ---- These will be installed into the flext directory given in config-pd-linux.txt. For the shared libraries to be found, be sure to specify the flext folder in the /etc/ld.so.conf. + With your project using flext, be sure to define "FLEXT_SYS=2". *************** *** 64,67 **** --- 71,75 ---- additional settings (e.g. target processor, compiler flags) can be made in makefile.pd-darwin + With your project using flext, be sure to define "FLEXT_SYS=2". *************** *** 70,73 **** --- 78,82 ---- ------------------ o Microsoft Visual C++ 6 or 7: edit "config-max-msvc.txt" & run "build-max-msvc.bat" + With your project using flext, be sure to define "FLEXT_SYS=1".

1 0

externals/hcs linuxevent-help.pd,NONE,1.1 linuxjoystick-help.pd,NONE,1.1 linuxmouse-help.pd,NONE,1.1 linuxevent.pd,1.1,NONE linuxmouse.pd,1.1,NONE linuxjoystick.pd,1.1,NONE
by eighthave＠users.sourceforge.net 17 Nov '03

17 Nov '03

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1:/tmp/cvs-serv31132 Added Files: linuxevent-help.pd linuxjoystick-help.pd linuxmouse-help.pd Removed Files: linuxevent.pd linuxmouse.pd linuxjoystick.pd Log Message: moved helpfiles to 0.37 style --- NEW FILE: linuxevent-help.pd --- #N canvas 454 205 450 300 10; #X floatatom 254 231 5 0 0 3 code - -; #X floatatom 318 231 5 0 0 3 value - -; #X floatatom 190 231 4 0 0 3 type - -; #X floatatom 117 231 9 0 0 3 time - -; #X msg 177 104 start; #X msg 178 126 stop; #X obj 127 208 linuxevent /dev/input/event0; #X obj 127 63 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X text 147 63 bang to get an update; #X text 225 116 start/stop polling; #X obj 52 67 metro 20; #X msg 182 165 delay 20; #X text 249 165 time between polls (ms); #X obj 51 35 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 75 39 stop; #X connect 4 0 6 0; #X connect 5 0 6 0; #X connect 6 0 3 0; #X connect 6 1 2 0; #X connect 6 2 0 0; #X connect 6 3 1 0; #X connect 7 0 6 0; #X connect 10 0 6 0; #X connect 11 0 6 0; #X connect 13 0 10 0; #X connect 14 0 10 0; --- NEW FILE: linuxjoystick-help.pd --- #N canvas 61 386 886 505 10; #X msg 192 64 start; #X msg 203 95 stop; #X floatatom 397 180 2 0 0 3 button# - -; #X floatatom 454 179 2 0 0 3 button_value - -; #X floatatom 143 180 5 0 0 3 y-axis - -; #X floatatom 95 180 5 0 0 3 x-axis - -; #X floatatom 242 181 3 0 0 3 hat-X - -; #X floatatom 288 181 3 0 0 3 hat-Y - -; #X floatatom 192 181 5 0 0 3 twist - -; #X floatatom 331 180 5 0 0 3 throttle - -; #X obj 192 123 linuxjoystick /dev/input/event1; #X obj 299 309 select 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21; #X obj 297 354 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 313 355 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 333 354 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 351 354 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 370 353 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 389 354 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 409 353 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 734 354 bng 30 250 50 0 empty empty not_recognized 0 -6 0 8 -261689 -1 -1; #X obj 689 352 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 667 350 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 647 351 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 631 354 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 613 352 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 596 350 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 579 352 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 561 351 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 541 349 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 523 351 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 503 350 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 485 351 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 466 351 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 447 353 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 428 353 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 439 220 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X connect 0 0 10 0; #X connect 1 0 10 0; #X connect 2 0 11 0; #X connect 3 0 35 0; #X connect 10 0 5 0; #X connect 10 1 4 0; #X connect 10 2 8 0; #X connect 10 3 6 0; #X connect 10 4 7 0; #X connect 10 5 9 0; #X connect 10 6 2 0; #X connect 10 7 3 0; #X connect 11 0 12 0; #X connect 11 1 13 0; #X connect 11 2 14 0; #X connect 11 3 15 0; #X connect 11 4 16 0; #X connect 11 5 17 0; #X connect 11 6 18 0; #X connect 11 7 34 0; #X connect 11 8 33 0; #X connect 11 9 32 0; #X connect 11 10 31 0; #X connect 11 11 30 0; #X connect 11 12 29 0; #X connect 11 13 28 0; #X connect 11 14 27 0; #X connect 11 15 26 0; #X connect 11 16 25 0; #X connect 11 17 24 0; #X connect 11 18 23 0; #X connect 11 19 22 0; #X connect 11 20 21 0; #X connect 11 21 20 0; #X connect 11 22 19 0; #X connect 35 0 2 0; --- NEW FILE: linuxmouse-help.pd --- #N canvas 454 205 450 300 10; #X floatatom 258 160 5 0 0 3 button# - -; #X floatatom 321 162 5 0 0 3 button_value - -; #X floatatom 175 160 2 0 0 3 wheel - -; #X floatatom 99 161 4 0 0 3 y-axis - -; #X floatatom 24 162 4 0 0 3 x-axis - -; #X obj 75 110 linuxmouse /dev/input/event0; #X msg 125 40 start; #X msg 136 78 stop; #X connect 5 0 4 0; #X connect 5 1 3 0; #X connect 5 2 2 0; #X connect 5 3 0 0; #X connect 5 4 1 0; #X connect 6 0 5 0; #X connect 7 0 5 0; --- linuxevent.pd DELETED --- --- linuxmouse.pd DELETED --- --- linuxjoystick.pd DELETED ---

1 0

externals/grill/fftease build-max-msvc.bat,NONE,1.1 config-max-msvc.txt,NONE,1.1 makefile.max-msvc,NONE,1.1 config-pd-msvc.txt,1.2,1.3 makefile.pd-msvc,1.3,1.4
by xovo＠users.sourceforge.net 15 Nov '03

15 Nov '03

Update of /cvsroot/pure-data/externals/grill/fftease In directory sc8-pr-cvs1:/tmp/cvs-serv15261 Modified Files: config-pd-msvc.txt makefile.pd-msvc Added Files: build-max-msvc.bat config-max-msvc.txt makefile.max-msvc Log Message: "" --- NEW FILE: build-max-msvc.bat --- @echo --- Building with MS Visual C++ --- nmake -f makefile.max-msvc clean nmake -f makefile.max-msvc --- NEW FILE: config-max-msvc.txt --- # FFTease - A set of Live Spectral Processors # Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform # # Copyright (c)Thomas Grill (xovo(a)gmx.net) # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "license.txt," in this distribution. # # where is the Max SDK? MAXSDKPATH="F:\prog\audio\MaxWinSDK\c74support" # where do the flext libraries reside? FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" # where is MS VC++? # (need not be defined if the build is started with the compiler environment set) # MSVCPATH="c:\programme\prog\microsoft visual studio\VC98" # where should the external be built? OUTPATH=max-msvc # where should the external be installed? # (leave blank to omit installation) INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" # some user-definable flags UFLAGS=/G6 /arch:SSE --- NEW FILE: makefile.max-msvc --- # FFTease - A set of Live Spectral Processors # Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform # # Copyright (c)Thomas Grill (xovo(a)gmx.net) # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "license.txt," in this distribution. # # # Makefile for MSVC++ 6 # # usage: # to build run "make -f makefile.max-msvc" # !include config-max-msvc.txt # includes INCPATH=/I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes /I$(FLEXTPATH) LDFLAGS=/LIBPATH:$(FLEXTPATH) !ifdef MSVCPATH INCPATH=$(INCPATH) /I$(MSVCPATH)\include LDFLAGS=$(LDFLAGS) /LIBPATH:$(MSVCPATH)\lib !endif !ifdef _DEBUG LIBS=flext_d-maxwin.lib LDFLAGS=$(LDFLAGS) /LIBPATH:$(MAXSDKPATH)\max-includes\win-includes\debug\ /LIBPATH:$(MAXSDKPATH)\msp-includes\win-includes\debug\ !else LIBS=flext-maxwin.lib LDFLAGS=$(LDFLAGS) /LIBPATH:$(MAXSDKPATH)\max-includes\win-includes\release\ /LIBPATH:$(MAXSDKPATH)\msp-includes\win-includes\release\ !endif LIBS=$(LIBS) maxapi.lib maxaudio.lib # compiler definitions and flags DEFS=/DFLEXT_SYS=1 $(UFLAGS) CFLAGS=/ML /GR- /GD /Ox /GX # the rest can stay untouched # ---------------------------------------------- # all the source files from the package !include make-files.txt # ----------------------------------------------- NAME=fftease EXT=mxe DIR=src all: $(OUTPATH) $(OUTPATH)\$(NAME).$(EXT) # remove build clean: -del /q $(OUTPATH) > nul -rmdir $(OUTPATH) > nul OBJS= $(SRCS:.c=.obj) OBJS= $(OBJS:.objpp=.obj) $(OUTPATH): -mkdir $(OUTPATH) > nul {$(DIR)}.cpp{}.obj: cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@ {$(DIR)}.c{}.obj: cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@ $(OUTPATH)\$(NAME).$(EXT): $(OBJS) cd $(OUTPATH) link /DLL $(LDFLAGS) /out:$(NAME).$(EXT) /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) @-del *.exp @-del *.lib cd .. !ifdef INSTPATH @-if not exist $(INSTPATH) mkdir $(INSTPATH) copy $@ $(INSTPATH) > nul !endif Index: config-pd-msvc.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/fftease/config-pd-msvc.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config-pd-msvc.txt 19 Jan 2003 21:11:54 -0000 1.2 --- config-pd-msvc.txt 15 Nov 2003 03:40:55 -0000 1.3 *************** *** 15,19 **** # where is MS VC++? ! MSVCPATH=c:\programme\prog\microsoft visual studio\VC98 --- 15,20 ---- # where is MS VC++? ! # (need not be defined if the build is started with the compiler environment set) ! # MSVCPATH=c:\programme\prog\microsoft visual studio\VC98 *************** *** 23,25 **** # where should the external be installed? # (leave blank to omit installation) ! INSTDIR=$(PDPATH)\extra --- 24,30 ---- # where should the external be installed? # (leave blank to omit installation) ! INSTPATH=$(PDPATH)\extra ! ! ! # some user-definable flags ! UFLAGS=/G6 \ No newline at end of file Index: makefile.pd-msvc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/fftease/makefile.pd-msvc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.pd-msvc 19 Jan 2003 21:11:54 -0000 1.3 --- makefile.pd-msvc 15 Nov 2003 03:40:55 -0000 1.4 *************** *** 21,27 **** # compiler definitions and flags ! DEFS=/DPD ! CFLAGS=/GR- /GX- /GD /G6 /Ox # the rest can stay untouched --- 21,27 ---- # compiler definitions and flags ! DEFS=/DFLEXT_SYS=2 ! CFLAGS=/GR- /GX- /GD /Ox # the rest can stay untouched *************** *** 34,40 **** NAME=fftease DIR=src ! all: $(OUTPATH) $(OUTPATH)\$(NAME).dll # remove build --- 34,41 ---- NAME=fftease + EXT=dll DIR=src ! all: $(OUTPATH) $(OUTPATH)\$(NAME).$(EXT) # remove build *************** *** 57,63 **** ! $(OUTPATH)\$(NAME).dll: $(OBJS) cd $(OUTPATH) ! link /DLL /out:$(NAME).dll /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) @-del *.exp @-del *.lib --- 58,64 ---- ! $(OUTPATH)\$(NAME).$(EXT): $(OBJS) cd $(OUTPATH) ! link /DLL /out:$(NAME).$(EXT) /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) @-del *.exp @-del *.lib

1 0

externals/grill/flext config-max-msvc.txt,1.2,1.3 make-inc.max-msvc,1.2,1.3
by xovo＠users.sourceforge.net 15 Nov '03

15 Nov '03

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1:/tmp/cvs-serv14368 Modified Files: config-max-msvc.txt make-inc.max-msvc Log Message: "" Index: config-max-msvc.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-max-msvc.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config-max-msvc.txt 13 Nov 2003 03:33:07 -0000 1.2 --- config-max-msvc.txt 15 Nov 2003 03:32:57 -0000 1.3 *************** *** 26,30 **** # where should flext libraries be installed? # (leave blank to omit installation) ! INSTDIR=$(PDPATH)\flext # user-definable compiler flags --- 26,30 ---- # where should flext libraries be installed? # (leave blank to omit installation) ! INSTDIR="%CommonProgramFiles%\Cycling '74\flext" # user-definable compiler flags Index: make-inc.max-msvc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/make-inc.max-msvc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** make-inc.max-msvc 13 Nov 2003 03:33:08 -0000 1.2 --- make-inc.max-msvc 15 Nov 2003 03:32:57 -0000 1.3 *************** *** 11,17 **** # includes ! INCPATH=/I$(MSVCPATH)\include /I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes /I$(SOURCE) ! LDFLAGS=/LIBPATH:$(MSVCPATH)\lib # compiler definitions and flags --- 11,21 ---- # includes ! INCPATH=/I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes /I$(SOURCE) ! LDFLAGS= + !ifdef MSVCPATH + INCPATH=$(INCPATH) /I$(MSVCPATH)\include + LDFLAGS=$(LDFLAGS) /LIBPATH:$(MSVCPATH)\lib + !endif # compiler definitions and flags

1 0

externals/grill/flext/source flext.h,1.16,1.17 flprefix.h,1.23,1.24 flsupport.h,1.54,1.55 flthr.cpp,1.20,1.21
by xovo＠users.sourceforge.net 13 Nov '03

13 Nov '03

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1:/tmp/cvs-serv14274/source Modified Files: flext.h flprefix.h flsupport.h flthr.cpp Log Message: "" Index: flext.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flext.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** flext.h 5 Aug 2003 02:32:31 -0000 1.16 --- flext.h 13 Nov 2003 03:33:09 -0000 1.17 *************** *** 45,49 **** --- 45,51 ---- #include <multiprocessing.h> #elif FLEXT_THREADS == FLEXT_THR_WIN32 + #define _WIN32_WINNT 0x500 // must be WIN2000 at least! #include <windows.h> + #include <process.h> #else #error "Thread model not supported" Index: flprefix.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flprefix.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** flprefix.h 17 Sep 2003 02:32:55 -0000 1.23 --- flprefix.h 13 Nov 2003 03:33:09 -0000 1.24 *************** *** 336,341 **** #undef FLEXT_THREADS #if FLEXT_OS == FLEXT_OS_MAC && FLEXT_SYS == FLEXT_SYS_MAX ! // Max crashes with posix threads (but don't know why...) #define FLEXT_THREADS FLEXT_THR_MP #else #define FLEXT_THREADS FLEXT_THR_POSIX --- 336,344 ---- #undef FLEXT_THREADS #if FLEXT_OS == FLEXT_OS_MAC && FLEXT_SYS == FLEXT_SYS_MAX ! // Max crashes with posix threads (because it's in the CFM model) #define FLEXT_THREADS FLEXT_THR_MP + #elif FLEXT_SYS == FLEXT_SYS_MAX && FLEXT_OS == FLEXT_OS_WIN + // for wmax use native Windows threads + #define FLEXT_THREADS FLEXT_THR_WIN32 #else #define FLEXT_THREADS FLEXT_THR_POSIX Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** flsupport.h 12 Nov 2003 03:35:19 -0000 1.54 --- flsupport.h 13 Nov 2003 03:33:09 -0000 1.55 *************** *** 637,640 **** --- 637,642 ---- #elif FLEXT_THREADS == FLEXT_THR_POSIX typedef pthread_t thrid_t; + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + typedef DWORD thrid_t; #else #error *************** *** 648,651 **** --- 650,655 ---- #elif FLEXT_THREADS == FLEXT_THR_MP return MPCurrentTaskID(); + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + return GetCurrentThreadId(); #else #error *************** *** 661,664 **** --- 665,670 ---- #if FLEXT_THREADS == FLEXT_THR_POSIX return pthread_equal(ref,t) != 0; + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + return ref == t; #else return ref == t; *************** *** 728,731 **** --- 734,738 ---- static bool StopHelper(); static void ThrHelper(void *); + static void LaunchHelper(thr_entry *e); //! the system's thread id *************** *** 743,746 **** --- 750,755 ---- #elif FLEXT_THREADS == FLEXT_THR_MP MPYield(); + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + SwitchToThread(); #else #error *************** *** 801,804 **** --- 810,835 ---- // int cnt; }; + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + { + public: + //! Construct thread mutex + ThrMutex() { ::InitializeCriticalSection(&mutex); } + //! Destroy thread mutex + ~ThrMutex() { ::DeleteCriticalSection(&mutex); } + + //! Lock thread mutex + bool Lock() { ::EnterCriticalSection(&mutex); return true; } + /*! Wait to lock thread mutex. + \todo Implement! + */ + // bool WaitForLock(double tm) { return pthread_mutex_lock(&mutex) == 0; } + //! Try to lock, but don't wait + bool TryLock() { return ::TryEnterCriticalSection(&mutex) != 0; } + //! Unlock thread mutex + bool Unlock() { ::LeaveCriticalSection(&mutex); return true; } + + protected: + CRITICAL_SECTION mutex; + }; #elif FLEXT_THREADS == FLEXT_THR_MP { *************** *** 843,847 **** /*! Wait for condition (for a certain time). \param ftime Wait time in seconds ! \ret 0 = signalled, 1 = timed out \remark If ftime = 0 this may suck away your cpu if used in a signalled loop. \remark The time resolution of the implementation is required to be at least ms. --- 874,878 ---- /*! Wait for condition (for a certain time). \param ftime Wait time in seconds ! \ret true = signalled, false = timed out \remark If ftime = 0 this may suck away your cpu if used in a signalled loop. \remark The time resolution of the implementation is required to be at least ms. *************** *** 850,857 **** //! Signal condition ! bool Signal(); protected: pthread_cond_t cond; }; #elif FLEXT_THREADS == FLEXT_THR_MP --- 881,913 ---- //! Signal condition ! bool Signal() { return pthread_cond_signal(&cond) == 0; } protected: pthread_cond_t cond; + }; + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + { + public: + //! Construct thread conditional + ThrCond() { cond = CreateEvent(NULL,FALSE,FALSE,NULL); } + //! Destroy thread conditional + ~ThrCond() { CloseHandle(cond); } + + //! Wait for condition + bool Wait() { return WaitForSingleObject(cond,INFINITE) == WAIT_OBJECT_0; } + + /*! Wait for condition (for a certain time). + \param ftime Wait time in seconds + \ret true = signalled, false = timed out + \remark If ftime = 0 this may suck away your cpu if used in a signalled loop. + \remark The time resolution of the implementation is required to be at least ms. + */ + bool TimedWait(double ftime) { return WaitForSingleObject(cond,(LONG)(ftime*1000)) == WAIT_OBJECT_0; } + + //! Signal condition + bool Signal() { return SetEvent(cond) != 0; } + + protected: + HANDLE cond; }; #elif FLEXT_THREADS == FLEXT_THR_MP Index: flthr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flthr.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** flthr.cpp 28 Jul 2003 02:32:41 -0000 1.20 --- flthr.cpp 13 Nov 2003 03:33:09 -0000 1.21 *************** *** 49,52 **** --- 49,58 ---- + void flext::LaunchHelper(thr_entry *e) + { + e->thrid = GetThreadId(); + e->meth(e->params); + } + //! Start helper thread bool flext::StartHelper() *************** *** 76,79 **** --- 82,87 ---- ok = ret == noErr; } + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + ok = _beginthread(ThrHelper,0,NULL) >= 0; #else #error *************** *** 101,108 **** #endif - //! Static helper thread function void flext::ThrHelper(void *) { #if FLEXT_THREADS == FLEXT_THR_POSIX // set prototype thread attributes --- 109,117 ---- #endif //! Static helper thread function void flext::ThrHelper(void *) { + thrhelpid = GetThreadId(); + #if FLEXT_THREADS == FLEXT_THR_POSIX // set prototype thread attributes *************** *** 140,146 **** // post("Helper start thread"); #if FLEXT_THREADS == FLEXT_THR_POSIX ! ok = pthread_create (&ti->thrid,&attr,(void *(*)(void *))ti->meth,ti->params) == 0; #elif FLEXT_THREADS == FLEXT_THR_MP ! ok = MPCreateTask((TaskProc)ti->meth,ti->params,0,0,0,0,0,&ti->thrid) == noErr; #else #error --- 149,159 ---- // post("Helper start thread"); #if FLEXT_THREADS == FLEXT_THR_POSIX ! thrid_t dummy; ! ok = pthread_create (&dummy,&attr,(void *(*)(void *))LaunchHelper,ti) == 0; #elif FLEXT_THREADS == FLEXT_THR_MP ! thrid_t dummy; ! ok = MPCreateTask((TaskProc)LaunchHelper,ti,0,0,0,0,0,&dummy) == noErr; ! #elif FLEXT_THREADS == FLEXT_THR_WIN32 ! ok = _beginthread((void (*)(void *))LaunchHelper,0,ti) >= 0; #else #error *************** *** 343,346 **** --- 356,363 ---- MPTerminateTask(t->thrid,0); // here, we should use a task queue to check whether the task has really terminated!! + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + // can't use the c library function _endthread.. memory leaks will occur + HANDLE hnd = OpenThread(THREAD_ALL_ACCESS,TRUE,t->thrid); + TerminateThread(hnd,0); #else #error *************** *** 400,403 **** --- 417,455 ---- } return true; + + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + HANDLE href = OpenThread(THREAD_ALL_ACCESS,TRUE,ref); + HANDLE hid = OpenThread(THREAD_ALL_ACCESS,TRUE,id); + int pr = GetThreadPriority(href); + + if(pr == THREAD_PRIORITY_ERROR_RETURN) { + #ifdef FLEXT_DEBUG + post("flext - failed to get thread priority"); + #endif + return false; + } + + pr += dp; + if(pr < THREAD_PRIORITY_IDLE) { + #ifdef FLEXT_DEBUG + post("flext - minimum thread priority reached"); + #endif + pr = THREAD_PRIORITY_IDLE; + } + else if(pr > THREAD_PRIORITY_TIME_CRITICAL) { + #ifdef FLEXT_DEBUG + post("flext - maximum thread priority reached"); + #endif + pr = THREAD_PRIORITY_TIME_CRITICAL; + } + + if(SetThreadPriority(hid,pr) == 0) { + #ifdef FLEXT_DEBUG + post("flext - failed to change thread priority"); + #endif + return false; + } + return true; + #elif FLEXT_THREADS == FLEXT_THR_MP thr_entry *t; *************** *** 442,445 **** --- 494,510 ---- } return parm.sched_priority; + + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + HANDLE hid = OpenThread(THREAD_ALL_ACCESS,TRUE,id); + int pr = GetThreadPriority(hid); + + if(pr == THREAD_PRIORITY_ERROR_RETURN) { + #ifdef FLEXT_DEBUG + post("flext - failed to get thread priority"); + #endif + return -1; + } + return pr; + #elif FLEXT_THREADS == FLEXT_THR_MP thr_entry *t; *************** *** 473,476 **** --- 538,552 ---- } return true; + + #elif FLEXT_THREADS == FLEXT_THR_WIN32 + HANDLE hid = OpenThread(THREAD_ALL_ACCESS,TRUE,id); + if(SetThreadPriority(hid,p) == 0) { + #ifdef FLEXT_DEBUG + post("flext - failed to change thread priority"); + #endif + return false; + } + return true; + #elif FLEXT_THREADS == FLEXT_THR_MP thr_entry *t; *************** *** 539,550 **** bool ret = pthread_cond_timedwait(&cond,&mutex,&tm) == 0; Unlock(); - return ret; - } - - bool flext::ThrCond::Signal() - { - // Lock(); - bool ret = pthread_cond_signal(&cond) == 0; - // Unlock(); return ret; } --- 615,618 ----

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

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 2003