Pd-cvs May 2006

pd-cvs@lists.iem.at

12 participants
138 discussions

externals Makefile,1.60,1.61 TODO,1.1,1.2
by Hans-Christoph Steiner 27 May '06

27 May '06

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8336 Modified Files: Makefile TODO Log Message: turned on gdb debugging flags; added corelibs to Pd-extended bulid system, doesn't build by default yet Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Makefile 25 May 2006 17:06:37 -0000 1.60 --- Makefile 27 May 2006 10:53:14 -0000 1.61 *************** *** 41,50 **** DEBUG_CFLAGS = -ggdb ! OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer $(DEBUG_CFLAGS) # this variable is to support old "win" directories, rather than "windows" BUILDSRC_OS_NAME = $(OS_NAME) ! CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -Wall -W LDFLAGS = LIBS = -lm --- 41,50 ---- DEBUG_CFLAGS = -ggdb ! OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer # this variable is to support old "win" directories, rather than "windows" BUILDSRC_OS_NAME = $(OS_NAME) ! CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -Wall -W $(DEBUG_CFLAGS) LDFLAGS = LIBS = -lm *************** *** 102,107 **** cat $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs` chmod a-x "$*.$(EXTENSION)" ! $(STRIP) $*.$(EXTENSION) ! rm -f -- $*.o --- 102,107 ---- cat $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs` chmod a-x "$*.$(EXTENSION)" ! # $(STRIP) $*.$(EXTENSION) ! # rm -f -- $*.o *************** *** 287,290 **** --- 287,324 ---- #------------------------------------------------------------------------------# + # CORELIBS + CORELIBS_NAME=corelibs + CORELIBS_OBJECTS := $(wildcard $(externals_src)/corelibs/*.c) + corelibs: $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) + + corelibs_install: corelibs + install -d $(objectsdir)/$(CORELIBS_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(CORELIBS_NAME) \ + --author "" \ + --description "" \ + --license "" \ + --version "" + install -p $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(CORELIBS_NAME) + install -d $(helpdir)/$(CORELIBS_NAME) + install -p $(externals_src)/corelibs/help/*.pd \ + $(helpdir)/$(CORELIBS_NAME) + # install -d $(manualsdir)/$(CORELIBS_NAME) + # install -p $(externals_src)/corelibs/manual.txt \ + # $(manualsdir)/$(CORELIBS_NAME) + install -p $(externals_src)/corelibs/README \ + $(readmesdir)/$(CORELIBS_NAME).txt + install -d $(examplesdir)/$(CORELIBS_NAME) + install -p $(externals_src)/corelibs/examples/*.pd \ + $(examplesdir)/$(CORELIBS_NAME) + + corelibs_clean: + -rm -f -- $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(CORELIBS_OBJECTS:.c=.o) + -rm -f -- $(externals_src)/corelibs/*.bak + -rm -f -- $(externals_src)/corelibs/*.*~ + + + + #------------------------------------------------------------------------------# # CREB CREB_NAME=creb *************** *** 1094,1098 **** - #---------------------------------------------------------------------------- # OSCx --- 1128,1131 ---- Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TODO 17 Mar 2006 05:00:53 -0000 1.1 --- TODO 27 May 2006 10:53:14 -0000 1.2 *************** *** 18,22 **** Gem/scale - iem/prepend flext/prepend --- 18,21 ----

1 0

externals/corelibs Makefile, NONE, 1.1 generate.sh, NONE, 1.1 lib_d_arithmetic.c, NONE, 1.1 lib_d_array.c, NONE, 1.1 lib_d_ctl.c, NONE, 1.1 lib_d_dac.c, NONE, 1.1 lib_d_delay.c, NONE, 1.1 lib_d_fft.c, NONE, 1.1 lib_d_filter.c, NONE, 1.1 lib_d_global.c, NONE, 1.1 lib_d_math.c, NONE, 1.1 lib_d_misc.c, NONE, 1.1 lib_d_osc.c, NONE, 1.1 lib_d_soundfile.c, NONE, 1.1 lib_d_ugen.c, NONE, 1.1 lib_x_acoustics.c, NONE, 1.1 lib_x_arithmetic.c, NONE, 1.1 lib_x_connective.c, NONE, 1.1 lib_x_gui.c, NONE, 1.1 lib_
by Hans-Christoph Steiner 27 May '06

27 May '06

Update of /cvsroot/pure-data/externals/corelibs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7603/corelibs Added Files: Makefile generate.sh lib_d_arithmetic.c lib_d_array.c lib_d_ctl.c lib_d_dac.c lib_d_delay.c lib_d_fft.c lib_d_filter.c lib_d_global.c lib_d_math.c lib_d_misc.c lib_d_osc.c lib_d_soundfile.c lib_d_ugen.c lib_x_acoustics.c lib_x_arithmetic.c lib_x_connective.c lib_x_gui.c lib_x_interface.c lib_x_list.c lib_x_midi.c lib_x_misc.c lib_x_net.c lib_x_qlist.c lib_x_time.c Log Message: wrote script to generate files to build internal Pd objects as separate libs; next, I'll write a patch which removes these from being compiled into the core, so then we'll really have 'pure pd' --- NEW FILE: lib_x_gui.c --- #include "../../pd/src/x_gui.c" void lib_x_gui_setup(void) { x_gui_setup(); } --- NEW FILE: lib_d_arithmetic.c --- #include "../../pd/src/d_arithmetic.c" void lib_d_arithmetic_setup(void) { d_arithmetic_setup(); } --- NEW FILE: lib_d_delay.c --- #include "../../pd/src/d_delay.c" void lib_d_delay_setup(void) { d_delay_setup(); } --- NEW FILE: Makefile --- TARGET := $(shell pwd | sed 's|.*/$.*$$$|\1|') EXTERNALS_ROOT := $(shell pwd | sed 's|^$/.*externals$.*|\1|') default: make -C $(EXTERNALS_ROOT) $(TARGET) install: make -C $(EXTERNALS_ROOT) $(TARGET)_install clean: make -C $(EXTERNALS_ROOT) $(TARGET)_clean test_locations: make -C $(EXTERNALS_ROOT) test_locations --- NEW FILE: lib_d_osc.c --- #include "../../pd/src/d_osc.c" void lib_d_osc_setup(void) { d_osc_setup(); } --- NEW FILE: lib_x_midi.c --- #include "../../pd/src/x_midi.c" void lib_x_midi_setup(void) { x_midi_setup(); } --- NEW FILE: lib_d_global.c --- #include "../../pd/src/d_global.c" void lib_d_global_setup(void) { d_global_setup(); } --- NEW FILE: lib_x_net.c --- #include "../../pd/src/x_net.c" void lib_x_net_setup(void) { x_net_setup(); } --- NEW FILE: lib_d_misc.c --- #include "../../pd/src/d_misc.c" void lib_d_misc_setup(void) { d_misc_setup(); } --- NEW FILE: lib_d_soundfile.c --- #include "../../pd/src/d_soundfile.c" void lib_d_soundfile_setup(void) { d_soundfile_setup(); } --- NEW FILE: lib_d_fft.c --- #include "../../pd/src/d_fftroutine.c" #include "../../pd/src/d_mayer_fft.c" #include "../../pd/src/d_fft.c" void lib_d_fft_setup(void) { d_fft_setup(); } --- NEW FILE: lib_d_filter.c --- #include "../../pd/src/d_filter.c" void lib_d_filter_setup(void) { d_filter_setup(); } --- NEW FILE: lib_d_ctl.c --- #include "../../pd/src/d_ctl.c" void lib_d_ctl_setup(void) { d_ctl_setup(); } --- NEW FILE: lib_x_time.c --- #include "../../pd/src/x_time.c" void lib_x_time_setup(void) { x_time_setup(); } --- NEW FILE: lib_x_list.c --- #include "../../pd/src/x_list.c" void lib_x_list_setup(void) { x_list_setup(); } --- NEW FILE: lib_x_arithmetic.c --- #include "../../pd/src/x_arithmetic.c" void lib_x_arithmetic_setup(void) { x_arithmetic_setup(); } --- NEW FILE: lib_x_interface.c --- #include "../../pd/src/x_interface.c" void lib_x_interface_setup(void) { x_interface_setup(); } --- NEW FILE: lib_x_qlist.c --- #include "../../pd/src/x_qlist.c" void lib_x_qlist_setup(void) { x_qlist_setup(); } --- NEW FILE: generate.sh --- #!/bin/sh # put these at the top of the file touch lib_d_fft.c echo '#include "../../pd/src/d_fftroutine.c"' >> lib_d_fft.c echo '#include "../../pd/src/d_mayer_fft.c"' >> lib_d_fft.c for file in ../../pd/src/[dx]_*.c; do newfile=`echo $file | sed 's|.*/src/$[dx]_$|lib_\1|'` touch $newfile echo -n '#include "' >> $newfile echo -n $file >> $newfile echo '"' >> $newfile echo "void "`echo $newfile|sed 's|$.*$\.c|\1|'`"_setup(void)" >> $newfile echo "{" >> $newfile echo $file | sed 's|.*src/$.*$\.c| \1_setup();|' >> $newfile echo "}" >> $newfile done # these files hold code for other classes, but no classes rm lib_d_fftroutine.c lib_d_mayer_fft.c lib_d_resample.c --- NEW FILE: lib_x_acoustics.c --- #include "../../pd/src/x_acoustics.c" void lib_x_acoustics_setup(void) { x_acoustics_setup(); } --- NEW FILE: lib_x_misc.c --- #include "../../pd/src/x_misc.c" void lib_x_misc_setup(void) { x_misc_setup(); } --- NEW FILE: lib_d_ugen.c --- #include "../../pd/src/d_ugen.c" void lib_d_ugen_setup(void) { d_ugen_setup(); } --- NEW FILE: lib_x_connective.c --- #include "../../pd/src/x_connective.c" void lib_x_connective_setup(void) { x_connective_setup(); } --- NEW FILE: lib_d_math.c --- #include "../../pd/src/d_math.c" void lib_d_math_setup(void) { d_math_setup(); } --- NEW FILE: lib_d_array.c --- #include "../../pd/src/d_array.c" void lib_d_array_setup(void) { d_array_setup(); } --- NEW FILE: lib_d_dac.c --- #include "../../pd/src/d_dac.c" void lib_d_dac_setup(void) { d_dac_setup(); }

1 0

externals/maxlib .DS_Store,1.1.1.1,NONE
by Hans-Christoph Steiner 27 May '06

27 May '06

Update of /cvsroot/pure-data/externals/maxlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4613/maxlib Removed Files: .DS_Store Log Message: removed Mac OS X cruft --- .DS_Store DELETED ---

1 0

externals/corelibs - New directory
by Hans-Christoph Steiner 27 May '06

27 May '06

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

1 0

externals/hcs/hid/doc hid-help.pd,1.19,1.20
by Hans-Christoph Steiner 27 May '06

27 May '06

Update of /cvsroot/pure-data/externals/hcs/hid/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7552/doc Modified Files: hid-help.pd Log Message: seemed to fix the mac crasher bug caused by HIDReleaseBuildList wierdness; cleaned up things a bit and made it possible to open devices by type Index: hid-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/doc/hid-help.pd,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** hid-help.pd 17 Mar 2006 04:57:20 -0000 1.19 --- hid-help.pd 27 May 2006 00:57:15 -0000 1.20 *************** *** 1,14 **** ! #N canvas 282 77 921 634 10; #X msg 455 295 key btn_0 0; - #X obj 455 274 prepend set; #X floatatom 27 484 5 0 0 0 - - -; #X floatatom 83 484 5 0 0 0 - - -; - #X msg 158 121 start; - #X msg 158 141 stop; - #X msg 261 110 open 0; - #X msg 268 128 open 1; - #X msg 275 146 open 2; #X floatatom 63 440 6 0 0 0 - - -; ! #X obj 68 122 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 25 25 ; #X floatatom 534 356 12 0 0 1 value - -; --- 1,8 ---- ! #N canvas 264 93 957 670 10; #X msg 455 295 key btn_0 0; #X floatatom 27 484 5 0 0 0 - - -; #X floatatom 83 484 5 0 0 0 - - -; #X floatatom 63 440 6 0 0 0 - - -; ! #X obj 129 122 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 25 ; #X floatatom 534 356 12 0 0 1 value - -; *************** *** 40,46 **** #X obj 241 383 +; #X msg 241 363 1; ! #X msg 366 124 close; ! #X msg 366 103 refresh; ! #X text 427 101 refresh device list; #X text 607 531 For more info:; #X text 49 588 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> --- 34,40 ---- #X obj 241 383 +; #X msg 241 363 1; ! #X msg 402 117 close; ! #X msg 402 96 refresh; ! #X text 463 94 refresh device list; #X text 607 531 For more info:; #X text 49 588 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> *************** *** 262,273 **** #X obj 421 439 route abs_hat0x abs_hat0y abs_hat1x abs_hat1y; #X floatatom 421 461 7 0 0 0 - - -; ! #X msg 118 121 1; ! #X msg 118 141 0; #X msg 868 3 pddp; ! #X obj 716 530 pddp_open all_about_hid; ! #X msg 366 145 print; #X obj 247 223 hid 0; ! #X text 429 125 close the device; ! #X text 429 146 print the device and element lists; #X text 10 50 Any non-zero value starts polling \,; #X text 10 63 0 stops the polling. If the number; --- 256,266 ---- #X obj 421 439 route abs_hat0x abs_hat0y abs_hat1x abs_hat1y; #X floatatom 421 461 7 0 0 0 - - -; ! #X msg 179 121 1; ! #X msg 179 141 0; #X msg 868 3 pddp; ! #X msg 402 138 print; #X obj 247 223 hid 0; ! #X text 465 118 close the device; ! #X text 465 139 print the device and element lists; #X text 10 50 Any non-zero value starts polling \,; #X text 10 63 0 stops the polling. If the number; *************** *** 280,284 **** #X msg 248 91 open \$1; #X obj 248 73 hradio 15 1 0 8 empty empty empty 0 -6 0 8 -262144 -1 ! -1 3; #X floatatom 235 94 1 0 0 0 - - -; #X text 387 248 event_type event_code value; --- 273,277 ---- #X msg 248 91 open \$1; #X obj 248 73 hradio 15 1 0 8 empty empty empty 0 -6 0 8 -262144 -1 ! -1 0; #X floatatom 235 94 1 0 0 0 - - -; #X text 387 248 event_type event_code value; *************** *** 288,292 **** -1; #X floatatom 498 461 7 0 0 0 - - -; ! #X obj 498 477 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X floatatom 576 461 7 0 0 0 - - -; --- 281,285 ---- -1; #X floatatom 498 461 7 0 0 0 - - -; ! #X obj 498 477 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X floatatom 576 461 7 0 0 0 - - -; *************** *** 310,322 **** #X obj 129 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 159 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 1 1; #X obj 189 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 219 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 1 1; #X obj 249 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 279 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 1 1; #X obj 309 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 --- 303,315 ---- #X obj 129 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 159 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; #X obj 189 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 219 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; #X obj 249 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 279 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; #X obj 309 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 *************** *** 334,406 **** #X obj 459 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X connect 1 0 0 0; ! #X connect 4 0 61 0; ! #X connect 5 0 61 0; ! #X connect 6 0 61 0; ! #X connect 7 0 61 0; ! #X connect 8 0 61 0; ! #X connect 10 0 61 0; ! #X connect 31 0 30 0; ! #X connect 31 0 14 0; ! #X connect 32 0 31 1; ! #X connect 33 0 34 1; ! #X connect 34 0 33 0; ! #X connect 35 0 34 0; ! #X connect 36 0 61 0; ! #X connect 37 0 61 0; ! #X connect 44 0 61 0; ! #X connect 45 0 61 0; ! #X connect 48 0 103 0; ! #X connect 48 1 69 0; ! #X connect 48 2 76 0; ! #X connect 48 3 35 0; ! #X connect 54 0 55 0; ! #X connect 54 1 78 0; ! #X connect 54 2 80 0; ! #X connect 54 3 82 0; ! #X connect 55 0 77 0; ! #X connect 56 0 61 0; ! #X connect 57 0 61 0; ! #X connect 60 0 61 0; ! #X connect 61 0 31 0; ! #X connect 61 0 1 0; ! #X connect 61 0 48 0; ! #X connect 61 0 71 0; ! #X connect 68 0 61 0; ! #X connect 69 0 2 0; ! #X connect 69 1 3 0; ! #X connect 69 2 53 0; ! #X connect 69 3 70 0; ! #X connect 71 0 13 0; ! #X connect 71 1 12 0; ! #X connect 71 2 11 0; ! #X connect 72 0 61 0; ! #X connect 73 0 72 0; #X connect 73 0 74 0; ! #X connect 76 0 9 0; ! #X connect 76 1 84 0; ! #X connect 76 2 85 0; ! #X connect 76 3 86 0; ! #X connect 76 4 87 0; ! #X connect 76 5 88 0; ! #X connect 76 6 89 0; ! #X connect 76 7 54 0; ! #X connect 78 0 79 0; ! #X connect 80 0 81 0; ! #X connect 82 0 83 0; ! #X connect 103 0 49 0; ! #X connect 103 1 90 0; ! #X connect 103 2 91 0; ! #X connect 103 3 92 0; ! #X connect 103 4 93 0; ! #X connect 103 5 94 0; ! #X connect 103 6 95 0; ! #X connect 103 7 96 0; ! #X connect 103 8 97 0; ! #X connect 103 9 98 0; ! #X connect 103 10 99 0; ! #X connect 103 11 100 0; ! #X connect 103 12 101 0; ! #X connect 103 13 102 0; ! #X connect 103 14 104 0; ! #X connect 103 15 105 0; --- 327,407 ---- #X obj 459 547 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 455 274 cyclone/prepend set; ! #X msg 37 196 debug \$1; ! #X obj 37 174 hradio 15 1 1 10 empty empty empty 0 -6 0 8 -262144 -1 ! -1 9; ! #X obj 716 530 pddp/pddp_open all_about_hid; ! #X msg 261 110 open mouse1; ! #X msg 270 133 open mouse; ! #X msg 270 157 open keyboard; ! #X connect 4 0 54 0; ! #X connect 25 0 24 0; ! #X connect 25 0 8 0; ! #X connect 26 0 25 1; ! #X connect 27 0 28 1; ! #X connect 28 0 27 0; ! #X connect 29 0 28 0; ! #X connect 30 0 54 0; ! #X connect 31 0 54 0; ! #X connect 38 0 54 0; ! #X connect 39 0 54 0; ! #X connect 42 0 96 0; ! #X connect 42 1 62 0; ! #X connect 42 2 69 0; ! #X connect 42 3 29 0; ! #X connect 48 0 49 0; ! #X connect 48 1 71 0; ! #X connect 48 2 73 0; ! #X connect 48 3 75 0; ! #X connect 49 0 70 0; ! #X connect 50 0 54 0; ! #X connect 51 0 54 0; ! #X connect 53 0 54 0; ! #X connect 54 0 25 0; ! #X connect 54 0 42 0; ! #X connect 54 0 64 0; ! #X connect 54 0 99 0; ! #X connect 61 0 54 0; ! #X connect 62 0 1 0; ! #X connect 62 1 2 0; ! #X connect 62 2 47 0; ! #X connect 62 3 63 0; ! #X connect 64 0 7 0; ! #X connect 64 1 6 0; ! #X connect 64 2 5 0; ! #X connect 65 0 54 0; ! #X connect 66 0 65 0; ! #X connect 66 0 67 0; ! #X connect 69 0 3 0; ! #X connect 69 1 77 0; ! #X connect 69 2 78 0; ! #X connect 69 3 79 0; ! #X connect 69 4 80 0; ! #X connect 69 5 81 0; ! #X connect 69 6 82 0; ! #X connect 69 7 48 0; ! #X connect 71 0 72 0; #X connect 73 0 74 0; ! #X connect 75 0 76 0; ! #X connect 96 0 43 0; ! #X connect 96 1 83 0; ! #X connect 96 2 84 0; ! #X connect 96 3 85 0; ! #X connect 96 4 86 0; ! #X connect 96 5 87 0; ! #X connect 96 6 88 0; ! #X connect 96 7 89 0; ! #X connect 96 8 90 0; ! #X connect 96 9 91 0; ! #X connect 96 10 92 0; ! #X connect 96 11 93 0; ! #X connect 96 12 94 0; ! #X connect 96 13 95 0; ! #X connect 96 14 97 0; ! #X connect 96 15 98 0; ! #X connect 99 0 0 0; ! #X connect 100 0 54 0; ! #X connect 101 0 100 0; ! #X connect 103 0 54 0; ! #X connect 104 0 54 0; ! #X connect 105 0 54 0;

1 0

externals/hcs/hid Makefile, 1.14, 1.15 TODO, 1.20, 1.21 hid.c, 1.21, 1.22 hid.h, 1.19, 1.20 hid_darwin.c, 1.18, 1.19 hid_linux.c, 1.14, 1.15 hid_windows.c, 1.1, 1.2 mouse.pd, 1.6, 1.7
by Hans-Christoph Steiner 27 May '06

27 May '06

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7552 Modified Files: Makefile TODO hid.c hid.h hid_darwin.c hid_linux.c hid_windows.c mouse.pd Log Message: seemed to fix the mac crasher bug caused by HIDReleaseBuildList wierdness; cleaned up things a bit and made it possible to open devices by type Index: hid.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** hid.c 25 Jan 2006 08:40:35 -0000 1.21 --- hid.c 27 May 2006 00:57:15 -0000 1.22 *************** *** 24,27 **** --- 24,33 ---- /* --------------------------------------------------------------------------*/ + #include <unistd.h> + #include <stdarg.h> + #include <stdlib.h> + #include <string.h> + #include <ctype.h> + #include "hid.h" *************** *** 33,36 **** --- 39,44 ---- //#define DEBUG(x) x + unsigned short global_debug_level = 0; + static t_class *hid_class; *************** *** 39,47 **** */ ! void hid_start(t_hid *x, t_float f); ! void hid_stop(t_hid *x); ! t_int hid_open(t_hid *x, t_float f); ! t_int hid_close(t_hid *x); ! t_int hid_read(t_hid *x,int fd); static void hid_float(t_hid* x, t_floatarg f); --- 47,54 ---- */ ! static void hid_poll(t_hid *x, t_float f); ! static t_int hid_open(t_hid *x, t_symbol *s, t_int argc, t_atom *argv); ! static t_int hid_close(t_hid *x); ! static t_int hid_read(t_hid *x,int fd); static void hid_float(t_hid* x, t_floatarg f); *************** *** 51,54 **** --- 58,101 ---- */ + void debug_print(t_int message_debug_level, const char *fmt, ...) + { + if(message_debug_level <= global_debug_level) + { + char buf[MAXPDSTRING]; + va_list ap; + //t_int arg[8]; + va_start(ap, fmt); + vsnprintf(buf, MAXPDSTRING-1, fmt, ap); + post(buf); + va_end(ap); + } + } + + void debug_error(t_hid *x, t_int message_debug_level, const char *fmt, ...) + { + if(message_debug_level <= global_debug_level) + { + char buf[MAXPDSTRING]; + va_list ap; + //t_int arg[8]; + va_start(ap, fmt); + vsnprintf(buf, MAXPDSTRING-1, fmt, ap); + pd_error(x, buf); + va_end(ap); + } + } + + static unsigned int name_to_usage(char *usage_name) + { // output usagepage << 16 + usage + if(strcmp(usage_name,"pointer") == 0) return(0x00010001); + if(strcmp(usage_name,"mouse") == 0) return(0x00010002); + if(strcmp(usage_name,"joystick") == 0) return(0x00010004); + if(strcmp(usage_name,"gamepad") == 0) return(0x00010005); + if(strcmp(usage_name,"keyboard") == 0) return(0x00010006); + if(strcmp(usage_name,"keypad") == 0) return(0x00010007); + if(strcmp(usage_name,"multiaxiscontroller") == 0) return(0x00010008); + return(0); + } + void hid_output_event(t_hid *x, char *type, char *code, t_float value) { *************** *** 62,65 **** --- 109,125 ---- } + /* stop polling the device */ + void stop_poll(t_hid* x) + { + debug_print(LOG_DEBUG,"stop_poll"); + + if (x->x_started) + { + clock_unset(x->x_clock); + debug_print(LOG_INFO,"[hid] polling stopped"); + x->x_started = 0; + } + } + void hid_set_from_float(t_hid *x, t_floatarg f) { *************** *** 69,113 **** { x->x_delay = (t_int)f; ! hid_start(x,f); } else if (f == 1) { if (! x->x_started) ! hid_start(x,f); } else if (f == 0) { ! hid_stop(x); } } /*------------------------------------------------------------------------------ ! * IMPLEMENTATION */ - /* stop polling the device */ - void hid_stop(t_hid* x) - { - DEBUG(post("hid_stop");); - - if (x->x_started) - { - clock_unset(x->x_clock); - DEBUG(post("[hid] polling stopped");); - x->x_started = 0; - } - } /* close the device */ t_int hid_close(t_hid *x) { ! DEBUG(post("hid_close");); /* just to be safe, stop it first */ ! hid_stop(x); if(! hid_close_device(x)) { ! post("[hid] closed device %d",x->x_device_number); x->x_device_open = 0; return (0); --- 129,161 ---- { x->x_delay = (t_int)f; ! hid_poll(x,f); } else if (f == 1) { if (! x->x_started) ! hid_poll(x,f); } else if (f == 0) { ! stop_poll(x); } } /*------------------------------------------------------------------------------ ! * METHODS FOR [hid]'s MESSAGES */ /* close the device */ t_int hid_close(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_close"); /* just to be safe, stop it first */ ! stop_poll(x); if(! hid_close_device(x)) { ! debug_print(LOG_INFO,"[hid] closed device %d",x->x_device_number); x->x_device_open = 0; return (0); *************** *** 127,143 **** */ ! t_int hid_open(t_hid *x, t_float f) { ! DEBUG(post("hid_open");); /* store running state to be restored after the device has been opened */ t_int started = x->x_started; /* only close the device if its different than the current and open */ ! if ( (f != x->x_device_number) && (x->x_device_open) ) hid_close(x); ! if (f > 0) ! x->x_device_number = f; else x->x_device_number = 0; --- 175,225 ---- */ ! t_int hid_open(t_hid *x, t_symbol *s, t_int argc, t_atom *argv) { ! debug_print(LOG_DEBUG,"hid_open"); ! unsigned short i; ! unsigned short device_number = 0; ! unsigned short usage_number; ! unsigned int usage; ! char usage_string[MAXPDSTRING] = ""; + if(argc == 1) + { + if(atom_getsymbolarg(0,argc,argv) == &s_) + { // single float arg means device + debug_print(LOG_DEBUG,"[hid] setting device# to %d",device_number); + device_number = (unsigned short) atom_getfloatarg(0,argc,argv); + } + else + { // single symbol arg means usagepage/usage + debug_print(LOG_DEBUG,"[hid] setting device via usagepage/usage"); + atom_string(argv, usage_string, MAXPDSTRING-1); + i = strlen(usage_string); + do { + --i; + } while(isdigit(usage_string[i])); + usage_number = strtol(usage_string + i + 1,NULL,10); + usage_string[i+1] = '\0'; + debug_print(LOG_DEBUG,"[hid] looking for %s #%d",usage_string,usage_number); + usage = name_to_usage(usage_string); + debug_print(LOG_DEBUG,"[hid] usage 0x%08x 0x%04x 0x%04x",usage, usage >> 16, usage & 0xffff); + device_number = get_device_number_from_usage_list(usage_number, + usage >> 16, usage & 0xffff); + } + } + else if( (argc == 2) && (atom_getsymbolarg(0,argc,argv) != NULL) + && (atom_getsymbolarg(1,argc,argv) != NULL) ) + { /* two symbols means idVendor and idProduct in hex */ + } + /* store running state to be restored after the device has been opened */ t_int started = x->x_started; /* only close the device if its different than the current and open */ ! if( (device_number != x->x_device_number) && (x->x_device_open) ) hid_close(x); ! if(device_number > 0) ! x->x_device_number = device_number; else x->x_device_number = 0; *************** *** 146,152 **** * therefore ignore the redundant open request. To reopen the same device, * send a [close( msg, then an [open( msg. */ ! if (! x->x_device_open) { ! if (hid_open_device(x,x->x_device_number)) { error("[hid] can not open device %d",x->x_device_number); --- 228,234 ---- * therefore ignore the redundant open request. To reopen the same device, * send a [close( msg, then an [open( msg. */ ! if(! x->x_device_open) { ! if(hid_open_device(x,x->x_device_number)) { error("[hid] can not open device %d",x->x_device_number); *************** *** 165,168 **** --- 247,252 ---- hid_set_from_float(x,x->x_delay); + debug_print(LOG_DEBUG,"[hid] done device# to %d",device_number); + return (0); } *************** *** 171,175 **** t_int hid_read(t_hid *x,int fd) { ! // DEBUG(post("hid_read");); hid_get_events(x); --- 255,259 ---- t_int hid_read(t_hid *x,int fd) { ! // debug_print(LOG_DEBUG,"hid_read"); hid_get_events(x); *************** *** 184,217 **** } ! void hid_start(t_hid* x, t_float f) { ! DEBUG(post("hid_start");); /* if the user sets the delay less than one, ignore */ ! if( f >= 1 ) x->x_delay = (t_int)f; if(!x->x_device_open) ! hid_open(x,x->x_device_number); ! if(!x->x_started) { clock_delay(x->x_clock, x->x_delay); ! DEBUG(post("[hid] polling started");); x->x_started = 1; } } static void hid_float(t_hid* x, t_floatarg f) { ! DEBUG(post("hid_float");); hid_set_from_float(x,f); } ! /* setup functions */ static void hid_free(t_hid* x) { ! DEBUG(post("hid_free");); hid_close(x); --- 268,327 ---- } ! void hid_poll(t_hid* x, t_float f) { ! debug_print(LOG_DEBUG,"hid_poll"); /* if the user sets the delay less than one, ignore */ ! if( f > 0 ) x->x_delay = (t_int)f; if(!x->x_device_open) ! hid_open(x,gensym("open"),0,NULL); ! if(!x->x_started) { clock_delay(x->x_clock, x->x_delay); ! debug_print(LOG_DEBUG,"[hid] polling started"); x->x_started = 1; } } + static void hid_anything(t_hid *x, t_symbol *s, t_int argc, t_atom *argv) + { + int i; + t_symbol *my_symbol; + char device_name[MAXPDSTRING]; + + startpost("ANYTHING! selector: %s data:"); + for(i=0; i<argc; ++i) + { + my_symbol = atom_getsymbolarg(i,argc,argv); + if(my_symbol != NULL) + post(" %s",my_symbol->s_name); + else + post(" %f",atom_getfloatarg(i,argc,argv)); + } + } + + static void hid_float(t_hid* x, t_floatarg f) { ! debug_print(LOG_DEBUG,"hid_float"); hid_set_from_float(x,f); } ! static void hid_debug(t_hid *x, t_float f) ! { ! global_debug_level = f; ! } ! ! ! /*------------------------------------------------------------------------------ ! * system functions ! */ static void hid_free(t_hid* x) { ! debug_print(LOG_DEBUG,"hid_free"); hid_close(x); *************** *** 226,236 **** { t_hid *x = (t_hid *)pd_new(hid_class); ! ! DEBUG(post("hid_new");); ! /* only display the version when the first instance is loaded */ if(!hid_instance_count) post("[hid] %d.%d, written by Hans-Christoph Steiner <hans(a)eds.org>", HID_MAJOR_VERSION, HID_MINOR_VERSION); #if !defined(__linux__) && !defined(__APPLE__) --- 336,349 ---- { t_hid *x = (t_hid *)pd_new(hid_class); ! ! debug_print(LOG_DEBUG,"hid_new"); ! /* only display the version when the first instance is loaded */ if(!hid_instance_count) + { post("[hid] %d.%d, written by Hans-Christoph Steiner <hans(a)eds.org>", HID_MAJOR_VERSION, HID_MINOR_VERSION); + post("\tcompiled on "__DATE__" at "__TIME__ " "); + } #if !defined(__linux__) && !defined(__APPLE__) *************** *** 241,244 **** --- 354,358 ---- /* init vars */ + global_debug_level = 9; /* high numbers here means see more messages */ x->x_has_ff = 0; x->x_device_open = 0; *************** *** 251,264 **** x->x_data_outlet = outlet_new(&x->x_obj, 0); x->x_device_name_outlet = outlet_new(&x->x_obj, 0); - - /* find and report the list of devices */ - hid_build_device_list(x); - - /* Open the device and save settings. If there is an error, return the object - * anyway, so that the inlets and outlets are created, thus not breaking the - * patch. */ - if (hid_open(x,f)) - error("[hid] device %d did not open",(t_int)f); hid_instance_count++; --- 365,376 ---- x->x_data_outlet = outlet_new(&x->x_obj, 0); x->x_device_name_outlet = outlet_new(&x->x_obj, 0); + x->x_device_number = 0; + + if(f > 0) + x->x_device_number = f; + else + x->x_device_number = 0; + hid_instance_count++; *************** *** 268,272 **** void hid_setup(void) { ! DEBUG(post("hid_setup");); hid_class = class_new(gensym("hid"), (t_newmethod)hid_new, --- 380,384 ---- void hid_setup(void) { ! debug_print(LOG_DEBUG,"hid_setup"); hid_class = class_new(gensym("hid"), (t_newmethod)hid_new, *************** *** 279,292 **** class_addfloat(hid_class,(t_method) hid_float); class_addbang(hid_class,(t_method) hid_read); /* add inlet message methods */ class_addmethod(hid_class,(t_method) hid_build_device_list,gensym("refresh"),0); class_addmethod(hid_class,(t_method) hid_print,gensym("print"),0); ! class_addmethod(hid_class,(t_method) hid_open,gensym("open"),A_DEFFLOAT,0); class_addmethod(hid_class,(t_method) hid_close,gensym("close"),0); ! class_addmethod(hid_class,(t_method) hid_start,gensym("start"),A_DEFFLOAT,0); ! class_addmethod(hid_class,(t_method) hid_start,gensym("poll"),A_DEFFLOAT,0); ! class_addmethod(hid_class,(t_method) hid_stop,gensym("stop"),0); ! class_addmethod(hid_class,(t_method) hid_stop,gensym("nopoll"),0); /* force feedback messages */ class_addmethod(hid_class,(t_method) hid_ff_autocenter, --- 391,403 ---- class_addfloat(hid_class,(t_method) hid_float); class_addbang(hid_class,(t_method) hid_read); + class_addanything(hid_class,(t_method) hid_anything); /* add inlet message methods */ + class_addmethod(hid_class,(t_method) hid_debug,gensym("debug"),A_DEFFLOAT,0); class_addmethod(hid_class,(t_method) hid_build_device_list,gensym("refresh"),0); class_addmethod(hid_class,(t_method) hid_print,gensym("print"),0); ! class_addmethod(hid_class,(t_method) hid_open,gensym("open"),A_GIMME,0); class_addmethod(hid_class,(t_method) hid_close,gensym("close"),0); ! class_addmethod(hid_class,(t_method) hid_poll,gensym("poll"),A_DEFFLOAT,0); /* force feedback messages */ class_addmethod(hid_class,(t_method) hid_ff_autocenter, Index: hid_windows.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_windows.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hid_windows.c 19 Dec 2005 20:40:31 -0000 1.1 --- hid_windows.c 27 May 2006 00:57:15 -0000 1.2 *************** *** 73,77 **** t_int hid_print_element_list(t_hid *x) { ! DEBUG(post("hid_print_element_list");); --- 73,77 ---- t_int hid_print_element_list(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_print_element_list"); *************** *** 249,253 **** t_int hid_get_events(t_hid *x) { ! //DEBUG(post("hid_get_events");); return (0); --- 249,253 ---- t_int hid_get_events(t_hid *x) { ! //debug_print(LOG_DEBUG,"hid_get_events"); return (0); *************** *** 257,261 **** t_int hid_open_device(t_hid *x, t_int device_number) { ! DEBUG(post("hid_open_device");); t_int result = 0; --- 257,261 ---- t_int hid_open_device(t_hid *x, t_int device_number) { ! debug_print(LOG_DEBUG,"hid_open_device"); t_int result = 0; *************** *** 267,271 **** t_int hid_close_device(t_hid *x) { ! DEBUG(post("hid_close_device");); t_int result = 0; --- 267,271 ---- t_int hid_close_device(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_close_device"); t_int result = 0; *************** *** 277,281 **** t_int hid_build_device_list(t_hid *x) { ! DEBUG(post("hid_build_device_list");); /* --- 277,281 ---- t_int hid_build_device_list(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_build_device_list"); /* *************** *** 322,326 **** void hid_platform_specific_free(t_hid *x) { ! DEBUG(post("hid_platform_specific_free");); /* only call this if the last instance is being freed */ if (hid_instance_count < 1) --- 322,326 ---- void hid_platform_specific_free(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_platform_specific_free"); /* only call this if the last instance is being freed */ if (hid_instance_count < 1) Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 26 May 2006 14:31:28 -0000 1.14 --- Makefile 27 May 2006 00:57:15 -0000 1.15 *************** *** 1,4 **** ! TARGET := `pwd|sed 's|.*/$.*$$|\1|'` ! EXTERNALS_ROOT := `pwd | sed 's|^$/.*externals$.*|\1|'` default: --- 1,4 ---- ! TARGET := $(shell pwd | sed 's|.*/$.*$$$|\1|') ! EXTERNALS_ROOT := $(shell pwd | sed 's|^$/.*externals$.*|\1|') default: *************** *** 11,157 **** make -C $(EXTERNALS_ROOT) $(TARGET)_clean - #============================================================================== - #============================================================================== - #============================================================================== - #============================================================================== - #============================================================================== - # this stuff below probably works, but its not maintained anymore since I use - # externals/Makefile - - CWD := $(shell pwd) - - # these are setup to be overridden by the packages/Makefile - cvs_root_dir = $(CWD)/../../.. - DESTDIR = $(CWD)/build/ - BUILDLAYOUT_DIR = $(cvs_root_dir)/packages - - -include $(BUILDLAYOUT_DIR)/Makefile.buildlayout - - - - CFLAGS = $(OPT_FLAGS) -Wall -I./ -I../../../pd/src - LDFLAGS = - LIBS = -lm - - ifeq (x$(OS_NAME),x) - default: - @echo no OS_NAME specified - endif - - - #SRC = $(wildcard $(externals_src)/hcs/hid/hid*.c) - SRC = $(wildcard *.c) - SRC = input_arrays.c hid_$(OS_NAME).c - OBJ := $(SRC:.c=.o) - - # ----------------------- GNU/LINUX i386 ----------------------- - ifeq ($(OS_NAME),linux) - EXTENSION = pd_linux - LDFLAGS += -export_dynamic -shared - LIBS += -lc - STRIP = strip --strip-unneeded - hid.$(EXTENSION): input_arrays $(OBJ) - endif - - # ----------------------- Windows MinGW ----------------------- - ifeq ($(OS_NAME),windows) - EXTENSION = dll - CFLAGS += -mms-bitfields - LDFLAGS += -shared - LIBS += -lhid -lsetupapi -L../../../pd/bin -lpd - STRIP = strip --strip-unneeded - hid.$(EXTENSION): input_arrays $(OBJ) - endif - - # ----------------------- DARWIN ----------------------- - ifeq ($(OS_NAME),darwin) - EXTENSION = pd_darwin - CFLAGS += -I./HID\ Utilities\ Source - PDEXECUTABLE = ../../../pd/bin/pd - FRAMEWORKS = Carbon IOKit ForceFeedback - LDFLAGS += -bundle -bundle_loader $(PDEXECUTABLE) - LIBS += -lc -L/sw/lib -L./HID\ Utilities\ Source/build \ - -lHIDUtilities $(patsubst %,-framework %,$(FRAMEWORKS)) - STRIP = strip -x - hid.$(EXTENSION): input_arrays hid_utilites $(OBJ) - .SUFFIXES: .pd_darwin - endif - - all: hid.$(EXTENSION) - - .SUFFIXES: .$(EXTENSION) - - # ----------------------- GENERAL --------------------------------------------- - # generic optimization - OPT_FLAGS = -O3 -ffast-math - # G4 optimization on Mac OS X - #OPT_FLAGS = -O3 -mcpu=7400 -maltivec -ffast-math -fPIC - # faster G4 7450 optimization (gives errors) on GNU/Linux - #OPT_FLAGS = -O3 -mcpu=7450 -maltivec -ffast-math -fPIC - # G4 optimization on Mac OS X - #OPT_FLAGS = -O3 -mcpu=7400 -faltivec -ffast-math -fPIC - # faster G4 7450 optimization (gives errors) on Mac OS X - #OPT_FLAGS = -ffast -mcpu=7450 -faltivec -ffast-math -fPIC - - %.o: %.c - $(CC) $(CFLAGS) -o "$*.o" -c "$*.c" - - %.$(EXTENSION): %.o - $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(OBJ) $(LIBS) \ - `test -f $*.libs && cat $*.libs` \ - `test -f $(dir $*)../$(OS_NAME)/$(notdir $*).libs && \ - cat $(dir $*)../$(OS_NAME)/$(notdir $*).libs` - chmod a-x "$*.$(EXTENSION)" - $(STRIP) $*.$(EXTENSION) - rm -f -- $*.o - - - input_arrays: input_arrays.c input_arrays.h - - input_arrays.c: linux/input.h - ./make-arrays-from-input.h.pl - - input_arrays.h: linux/input.h - ./make-arrays-from-input.h.pl - - - hid_utilities: - test -f ./HID\ Utilities\ Source/build/libHIDUtilities.a || \ - ( cd ./HID\ Utilities\ Source && pbxbuild ) - - - local_clean: - -rm -f -- *.$(EXTENSION) *~ - -find . -name '*.o' | xargs rm -f -- - - distclean: local_clean - -rm -f -- input_arrays.? doc/ev*-list.pd - - .PHONY: all input_arrays hid_utilities clean distclean - - test_locations: ! @echo "EXTENSION: $(EXTENSION)" ! @echo "CFLAGS: $(CFLAGS)" ! @echo "LDFLAGS: $(LDFLAGS)" ! @echo "LIBS: $(LIBS)" ! @echo "STRIP: $(STRIP)" ! @echo " " ! @echo "SRC: $(SRC)" ! @echo "OBJ: $(OBJ)" ! @echo " " ! @echo "OS_NAME: $(OS_NAME)" ! @echo "PD_VERSION: $(PD_VERSION)" ! @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" ! @echo "CWD: $(CWD)" ! @echo "DESTDIR: $(DESTDIR)" ! @echo "PREFIX: $(prefix)" ! @echo "BINDIR: $(bindir)" ! @echo "LIBDIR: $(libdir)" ! @echo "OBJECTSDIR: $(objectsdir)" ! @echo "PDDOCDIR: $(pddocdir)" ! @echo "LIBPDDIR: $(libpddir)" ! @echo "LIBPDBINDIR: $(libpdbindir)" ! @echo "HELPDIR: $(helpdir)" ! @echo "MANUALSDIR: $(manualsdir)" ! @echo "EXAMPLESDIR: $(examplesdir)" --- 11,15 ---- make -C $(EXTERNALS_ROOT) $(TARGET)_clean test_locations: ! make -C $(EXTERNALS_ROOT) test_locations ! Index: hid.h =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** hid.h 25 Jan 2006 08:40:35 -0000 1.19 --- hid.h 27 May 2006 00:57:15 -0000 1.20 *************** *** 3,6 **** --- 3,7 ---- #include <stdio.h> + #include <sys/syslog.h> #include <m_pd.h> *************** *** 13,17 **** #define HID_MAJOR_VERSION 0 ! #define HID_MINOR_VERSION 6 /* static char *version = "$Revision$"; */ --- 14,18 ---- #define HID_MAJOR_VERSION 0 ! #define HID_MINOR_VERSION 7 /* static char *version = "$Revision$"; */ *************** *** 22,36 **** typedef struct _hid { ! t_object x_obj; ! t_int x_fd; ! t_int x_device_number; ! t_int x_has_ff; ! void *x_ff_device; ! t_clock *x_clock; ! t_int x_delay; ! t_int x_started; ! t_int x_device_open; ! t_outlet *x_data_outlet; ! t_outlet *x_device_name_outlet; } t_hid; --- 23,40 ---- typedef struct _hid { ! t_object x_obj; ! t_int x_fd; ! // unsigned short x_device_number; ! t_float x_device_number; ! unsigned short vendor_id; // USB idVendor for current device ! unsigned short product_id; // USB idProduct for current device ! t_int x_has_ff; ! void *x_ff_device; ! t_clock *x_clock; ! t_int x_delay; ! t_int x_started; ! t_int x_device_open; ! t_outlet *x_data_outlet; ! t_outlet *x_device_name_outlet; } t_hid; *************** *** 53,56 **** --- 57,61 ---- t_int hid_instance_count; + extern unsigned short global_debug_level; /*------------------------------------------------------------------------------ *************** *** 59,86 **** /* support functions */ ! void hid_output_event( t_hid *x, char *type, char *code, t_float value ); /* generic, cross-platform functions implemented in a separate file for each * platform */ ! t_int hid_open_device( t_hid *x, t_int device_number ); ! t_int hid_close_device( t_hid *x ); ! t_int hid_build_device_list( t_hid* x ); ! t_int hid_get_events( t_hid *x ) ; ! void hid_print( t_hid* x ); ! void hid_platform_specific_free( t_hid *x ); /* cross-platform force feedback functions */ ! t_int hid_ff_autocenter( t_hid *x, t_float value ); ! t_int hid_ff_gain( t_hid *x, t_float value ); ! t_int hid_ff_motors( t_hid *x, t_float value ); ! t_int hid_ff_continue( t_hid *x ); ! t_int hid_ff_pause( t_hid *x ); ! t_int hid_ff_reset( t_hid *x ); ! t_int hid_ff_stopall( t_hid *x ); // these are just for testing... ! t_int hid_ff_fftest ( t_hid *x, t_float value); ! void hid_ff_print( t_hid *x ); --- 64,97 ---- /* support functions */ ! void debug_print(t_int debug_level, const char *fmt, ...); ! void debug_error(t_hid *x, t_int debug_level, const char *fmt, ...); ! void hid_output_event(t_hid *x, char *type, char *code, t_float value); /* generic, cross-platform functions implemented in a separate file for each * platform */ ! t_int hid_open_device(t_hid *x, t_int device_number); ! t_int hid_close_device(t_hid *x); ! void hid_build_device_list(void); ! t_int hid_get_events(t_hid *x); ! void hid_print(t_hid* x); ! void hid_platform_specific_free(t_hid *x); ! t_int get_device_number_by_ids(unsigned short vendor_id, unsigned short product_id); ! t_int get_device_number_from_usage_list(t_int device_number, ! unsigned short usage_page, unsigned short usage); ! /* cross-platform force feedback functions */ ! t_int hid_ff_autocenter(t_hid *x, t_float value); ! t_int hid_ff_gain(t_hid *x, t_float value); ! t_int hid_ff_motors(t_hid *x, t_float value); ! t_int hid_ff_continue(t_hid *x); ! t_int hid_ff_pause(t_hid *x); ! t_int hid_ff_reset(t_hid *x); ! t_int hid_ff_stopall(t_hid *x); // these are just for testing... ! t_int hid_ff_fftest (t_hid *x, t_float value); ! void hid_ff_print(t_hid *x); Index: mouse.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/mouse.pd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mouse.pd 10 Jun 2005 20:16:45 -0000 1.6 --- mouse.pd 27 May 2006 00:57:15 -0000 1.7 *************** *** 1,3 **** ! #N canvas 212 125 775 600 10; #X obj 130 18 inlet; #X obj 25 521 outlet; --- 1,3 ---- ! #N canvas 212 125 783 608 10; #X obj 130 18 inlet; #X obj 25 521 outlet; *************** *** 38,42 **** #X text 41 489 zero when no motion; #X obj 43 48 loadbang; - #X msg 43 71 25; #X obj 213 401 delay; #X obj 207 444 metro; --- 38,41 ---- *************** *** 51,54 **** --- 50,54 ---- #X obj 108 378 * 2; #X obj 258 378 * 2; + #X msg 43 71 5; #X connect 0 0 28 0; #X connect 6 0 5 0; *************** *** 58,62 **** #X connect 14 0 13 0; #X connect 15 0 1 0; ! #X connect 15 0 43 0; #X connect 16 0 2 0; #X connect 16 0 33 0; --- 58,62 ---- #X connect 14 0 13 0; #X connect 15 0 1 0; ! #X connect 15 0 42 0; #X connect 16 0 2 0; #X connect 16 0 33 0; *************** *** 71,94 **** #X connect 28 1 20 0; #X connect 29 0 20 0; ! #X connect 31 0 49 0; #X connect 32 0 29 0; ! #X connect 33 0 38 0; ! #X connect 33 0 41 0; #X connect 34 0 1 0; ! #X connect 36 0 37 0; ! #X connect 37 0 30 0; ! #X connect 38 0 40 0; ! #X connect 39 0 27 0; ! #X connect 40 0 39 0; ! #X connect 41 0 39 0; ! #X connect 42 0 48 0; ! #X connect 43 0 44 0; ! #X connect 43 0 47 0; ! #X connect 44 0 46 0; ! #X connect 45 0 34 0; ! #X connect 46 0 45 0; ! #X connect 47 0 45 0; ! #X connect 48 0 44 1; ! #X connect 48 0 45 1; ! #X connect 49 0 38 1; ! #X connect 49 0 39 1; --- 71,94 ---- #X connect 28 1 20 0; #X connect 29 0 20 0; ! #X connect 31 0 48 0; #X connect 32 0 29 0; ! #X connect 33 0 37 0; ! #X connect 33 0 40 0; #X connect 34 0 1 0; ! #X connect 36 0 49 0; ! #X connect 37 0 39 0; ! #X connect 38 0 27 0; ! #X connect 39 0 38 0; ! #X connect 40 0 38 0; ! #X connect 41 0 47 0; ! #X connect 42 0 43 0; ! #X connect 42 0 46 0; ! #X connect 43 0 45 0; ! #X connect 44 0 34 0; ! #X connect 45 0 44 0; ! #X connect 46 0 44 0; ! #X connect 47 0 43 1; ! #X connect 47 0 44 1; ! #X connect 48 0 37 1; ! #X connect 48 0 38 1; ! #X connect 49 0 30 0; Index: hid_darwin.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_darwin.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** hid_darwin.c 10 Jun 2005 20:17:42 -0000 1.18 --- hid_darwin.c 27 May 2006 00:57:15 -0000 1.19 *************** *** 64,68 **** /*============================================================================== ! * FUNCTION PROTOTYPES *============================================================================== */ --- 64,68 ---- /*============================================================================== ! h * FUNCTION PROTOTYPES *============================================================================== */ *************** *** 97,101 **** void convertDarwinElementToLinuxTypeCode(pRecElement element, char *linux_type, char *linux_code) { ! t_int button_offset = 0; switch(element->type) --- 97,101 ---- void convertDarwinElementToLinuxTypeCode(pRecElement element, char *linux_type, char *linux_code) { ! // t_int button_offset = 0; switch(element->type) *************** *** 203,206 **** --- 203,261 ---- } + t_int get_device_number_by_ids(unsigned short vendor_id, unsigned short product_id) + { + return(1); + } + + t_int get_device_number_from_usage_list(t_int device_number, + unsigned short usage_page, unsigned short usage) + { + debug_print(LOG_DEBUG,"get_device_number_from_usage_list"); + + pRecDevice pCurrentHIDDevice; + t_int i; + t_int device_count; + t_int total_devices = 0; + char cstrDeviceName[MAXPDSTRING]; + + if( !HIDHaveDeviceList() ) hid_build_device_list(); + + pCurrentHIDDevice = HIDGetFirstDevice(); + while(pCurrentHIDDevice != NULL) + { + if( (pCurrentHIDDevice->usagePage == usage_page) && + (pCurrentHIDDevice->usage == usage) ) + { + ++total_devices; + } + pCurrentHIDDevice = HIDGetNextDevice(pCurrentHIDDevice); + } + i = total_devices; + device_count = HIDCountDevices(); + debug_print(LOG_DEBUG,"[hid] %d is less than %d",i,device_number); + pCurrentHIDDevice = HIDGetFirstDevice(); + while( (pCurrentHIDDevice != NULL) && (i > device_number) ) + { + debug_print(LOG_DEBUG,"[hid] %d: %d == %d %d == %d",i, + pCurrentHIDDevice->usagePage, + usage_page, + pCurrentHIDDevice->usage, + usage); + device_count--; + if( (pCurrentHIDDevice->usagePage == usage_page) && + (pCurrentHIDDevice->usage == usage) ) + { + i--; + HIDGetUsageName(pCurrentHIDDevice->usagePage, + pCurrentHIDDevice->usage, + cstrDeviceName); + debug_print(LOG_DEBUG,"[hid]: found a %s at %d: %s %s",cstrDeviceName,i, + pCurrentHIDDevice->manufacturer,pCurrentHIDDevice->product); + } + pCurrentHIDDevice = HIDGetNextDevice(pCurrentHIDDevice); + } + return(device_count); + } + void hid_build_element_list(t_hid *x) *************** *** 211,215 **** t_int hid_print_element_list(t_hid *x) { ! DEBUG(post("hid_print_element_list");); UInt32 i; --- 266,270 ---- t_int hid_print_element_list(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_print_element_list"); UInt32 i; *************** *** 265,269 **** void hid_ff_print( t_hid *x ) { ! DEBUG(post("hid_ff_print");); HRESULT result; UInt32 value; --- 320,324 ---- void hid_ff_print( t_hid *x ) { ! debug_print(LOG_DEBUG,"hid_ff_print"); HRESULT result; UInt32 value; *************** *** 292,296 **** char cstrDeviceName [256]; t_int i,numdevs; ! UInt32 usagePage, usage; pRecDevice pCurrentHIDDevice = NULL; --- 347,351 ---- char cstrDeviceName [256]; t_int i,numdevs; ! // UInt32 usagePage, usage; pRecDevice pCurrentHIDDevice = NULL; *************** *** 304,317 **** { pCurrentHIDDevice = hid_get_device_by_number(i); ! post("Device %d: '%s' '%s' version %d",i,pCurrentHIDDevice->manufacturer, ! pCurrentHIDDevice->product,pCurrentHIDDevice->version); //usage ! HIDGetUsageName (pCurrentHIDDevice->usagePage, pCurrentHIDDevice->usage, cstrDeviceName); ! DEBUG(post(" vendorID: %d productID: %d locID: %d", pCurrentHIDDevice->vendorID, pCurrentHIDDevice->productID, ! pCurrentHIDDevice->locID);); } post(""); --- 359,379 ---- { pCurrentHIDDevice = hid_get_device_by_number(i); ! debug_print(LOG_INFO,"Device %d: '%s' '%s' version %d", ! i, ! pCurrentHIDDevice->manufacturer, ! pCurrentHIDDevice->product, ! pCurrentHIDDevice->version); //usage ! HIDGetUsageName(pCurrentHIDDevice->usagePage, pCurrentHIDDevice->usage, cstrDeviceName); ! debug_print(LOG_INFO,"\t\tcstrDeviceName: %s",cstrDeviceName); ! debug_print(LOG_INFO,"\t\tusage page: 0x%04x\tusage: 0x%04x", ! pCurrentHIDDevice->usagePage, ! pCurrentHIDDevice->usage); ! debug_print(LOG_INFO,"\t\tvendorID: 0x%04x\tproductID: 0x%04x\tlocID: 0x%08x", pCurrentHIDDevice->vendorID, pCurrentHIDDevice->productID, ! pCurrentHIDDevice->locID); } post(""); *************** *** 322,326 **** { char *device_name; ! t_symbol *device_name_symbol; device_name = malloc( strlen(manufacturer) + 1 + strlen(product) + 1 ); --- 384,388 ---- { char *device_name; ! // t_symbol *device_name_symbol; device_name = malloc( strlen(manufacturer) + 1 + strlen(product) + 1 ); *************** *** 345,349 **** t_int hid_ff_autocenter(t_hid *x, t_float value) { ! DEBUG(post("hid_ff_autocenter");); HRESULT result; UInt32 autocenter_value; --- 407,411 ---- t_int hid_ff_autocenter(t_hid *x, t_float value) { ! debug_print(LOG_DEBUG,"hid_ff_autocenter"); HRESULT result; UInt32 autocenter_value; *************** *** 369,373 **** t_int hid_ff_gain(t_hid *x, t_float value) { ! DEBUG(post("hid_ff_gain");); HRESULT result; UInt32 ffgain_value; --- 431,435 ---- t_int hid_ff_gain(t_hid *x, t_float value) { ! debug_print(LOG_DEBUG,"hid_ff_gain"); HRESULT result; UInt32 ffgain_value; *************** *** 409,413 **** t_int hid_ff_continue( t_hid *x ) { ! DEBUG(post("hid_ff_continue");); return( hid_ff_send_ff_command( x, FFSFFC_CONTINUE ) ); } --- 471,475 ---- t_int hid_ff_continue( t_hid *x ) { ! debug_print(LOG_DEBUG,"hid_ff_continue"); return( hid_ff_send_ff_command( x, FFSFFC_CONTINUE ) ); } *************** *** 415,419 **** t_int hid_ff_pause( t_hid *x ) { ! DEBUG(post("hid_ff_pause");); return( hid_ff_send_ff_command( x, FFSFFC_PAUSE ) ); } --- 477,481 ---- t_int hid_ff_pause( t_hid *x ) { ! debug_print(LOG_DEBUG,"hid_ff_pause"); return( hid_ff_send_ff_command( x, FFSFFC_PAUSE ) ); } *************** *** 421,425 **** t_int hid_ff_reset( t_hid *x ) { ! DEBUG(post("hid_ff_reset");); return( hid_ff_send_ff_command( x, FFSFFC_RESET ) ); } --- 483,487 ---- t_int hid_ff_reset( t_hid *x ) { ! debug_print(LOG_DEBUG,"hid_ff_reset"); return( hid_ff_send_ff_command( x, FFSFFC_RESET ) ); } *************** *** 427,431 **** t_int hid_ff_setactuatorsoff( t_hid *x ) { ! DEBUG(post("hid_ff_setactuatorsoff");); return( hid_ff_send_ff_command( x, FFSFFC_SETACTUATORSOFF ) ); } --- 489,493 ---- t_int hid_ff_setactuatorsoff( t_hid *x ) { ! debug_print(LOG_DEBUG,"hid_ff_setactuatorsoff"); return( hid_ff_send_ff_command( x, FFSFFC_SETACTUATORSOFF ) ); } *************** *** 433,437 **** t_int hid_ff_setactuatorson( t_hid *x ) { ! DEBUG(post("hid_ff_setactuatorson");); return( hid_ff_send_ff_command( x, FFSFFC_SETACTUATORSON ) ); } --- 495,499 ---- t_int hid_ff_setactuatorson( t_hid *x ) { ! debug_print(LOG_DEBUG,"hid_ff_setactuatorson"); return( hid_ff_send_ff_command( x, FFSFFC_SETACTUATORSON ) ); } *************** *** 439,443 **** t_int hid_ff_stopall( t_hid *x ) { ! DEBUG(post("hid_ff_stopall");); return( hid_ff_send_ff_command( x, FFSFFC_STOPALL ) ); } --- 501,505 ---- t_int hid_ff_stopall( t_hid *x ) { ! debug_print(LOG_DEBUG,"hid_ff_stopall"); return( hid_ff_send_ff_command( x, FFSFFC_STOPALL ) ); } *************** *** 462,466 **** t_int hid_ff_fftest ( t_hid *x, t_float value) { ! DEBUG(post("hid_get_events");); return( 0 ); --- 524,528 ---- t_int hid_ff_fftest ( t_hid *x, t_float value) { ! debug_print(LOG_DEBUG,"hid_get_events"); return( 0 ); *************** *** 473,477 **** t_int hid_get_events(t_hid *x) { ! //DEBUG(post("hid_get_events");); SInt32 value; --- 535,539 ---- t_int hid_get_events(t_hid *x) { ! //debug_print(LOG_DEBUG,"hid_get_events"); SInt32 value; *************** *** 482,489 **** char code[256]; char event_output_string[256]; ! t_atom event_data[4]; int event_counter = 0; ! Boolean result; pCurrentHIDDevice = hid_get_device_by_number(x->x_device_number); --- 544,551 ---- char code[256]; char event_output_string[256]; ! // t_atom event_data[4]; int event_counter = 0; ! // Boolean result; pCurrentHIDDevice = hid_get_device_by_number(x->x_device_number); *************** *** 624,649 **** t_int hid_open_device(t_hid *x, t_int device_number) { ! DEBUG(post("hid_open_device");); t_int result = 0; pRecDevice pCurrentHIDDevice = NULL; ! io_service_t hidDevice = NULL; FFDeviceObjectReference ffDeviceReference = NULL; /* rebuild device list to make sure the list is current */ ! if ( ! HIDHaveDeviceList() ) ! { ! result = (t_int) HIDBuildDeviceList (NULL, NULL); ! // returns false if no device found ! if(result) ! { ! error("[hid]: no HID devices found\n"); ! return(result); ! } ! } pCurrentHIDDevice = hid_get_device_by_number(device_number); ! if ( ! HIDIsValidDevice(pCurrentHIDDevice) ) { error("[hid]: device %d is not a valid device\n",device_number); --- 686,702 ---- t_int hid_open_device(t_hid *x, t_int device_number) { ! debug_print(LOG_DEBUG,"hid_open_device"); t_int result = 0; pRecDevice pCurrentHIDDevice = NULL; ! io_service_t hidDevice = 0; FFDeviceObjectReference ffDeviceReference = NULL; /* rebuild device list to make sure the list is current */ ! if( !HIDHaveDeviceList() ) hid_build_device_list(); pCurrentHIDDevice = hid_get_device_by_number(device_number); ! if( ! HIDIsValidDevice(pCurrentHIDDevice) ) { error("[hid]: device %d is not a valid device\n",device_number); *************** *** 659,666 **** hidDevice = AllocateHIDObjectFromRecDevice( pCurrentHIDDevice ); ! if ( FFIsForceFeedback(hidDevice) == FF_OK ) { post("\tdevice has Force Feedback support"); ! if ( FFCreateDevice(hidDevice,&ffDeviceReference) == FF_OK ) { x->x_has_ff = 1; --- 712,719 ---- hidDevice = AllocateHIDObjectFromRecDevice( pCurrentHIDDevice ); ! if( FFIsForceFeedback(hidDevice) == FF_OK ) { post("\tdevice has Force Feedback support"); ! if( FFCreateDevice(hidDevice,&ffDeviceReference) == FF_OK ) { x->x_has_ff = 1; *************** *** 685,689 **** t_int hid_close_device(t_hid *x) { ! DEBUG(post("hid_close_device");); t_int result = 0; --- 738,742 ---- t_int hid_close_device(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_close_device"); t_int result = 0; *************** *** 691,695 **** HIDDequeueDevice(pCurrentHIDDevice); ! // this doesn't seem to be needed at all // result = HIDCloseReleaseInterface(pCurrentHIDDevice); --- 744,748 ---- HIDDequeueDevice(pCurrentHIDDevice); ! // this doesn't seem to be needed at all, but why not use it? // result = HIDCloseReleaseInterface(pCurrentHIDDevice); *************** *** 698,724 **** ! t_int hid_build_device_list(t_hid *x) { ! DEBUG(post("hid_build_device_list");); ! ! pRecDevice pCurrentHIDDevice; ! t_atom device_name_atoms[2]; ! ! // returns false if no device found ! if(HIDBuildDeviceList (NULL, NULL)) ! error("[hid]: no HID devices found\n"); ! ! /* send the [options( msg to set the [hid_menu] to blank */ ! outlet_anything( x->x_device_name_outlet, gensym( "options" ),0,NULL ); ! pCurrentHIDDevice = HIDGetFirstDevice(); ! while ( pCurrentHIDDevice != NULL ) ! { ! hid_output_device_name( x, pCurrentHIDDevice->manufacturer, ! pCurrentHIDDevice->product ); ! pCurrentHIDDevice = HIDGetNextDevice(pCurrentHIDDevice); ! } ! ! return (0); } --- 751,762 ---- ! void hid_build_device_list(void) { ! debug_print(LOG_DEBUG,"hid_build_device_list"); ! debug_print(LOG_WARNING,"[hid] Building device list..."); ! if(HIDBuildDeviceList (0, 0)) ! post("[hid]: no HID devices found\n"); ! debug_print(LOG_WARNING,"[hid] completed device list."); } *************** *** 738,742 **** void hid_platform_specific_free(t_hid *x) { ! DEBUG(post("hid_platform_specific_free");); /* only call this if the last instance is being freed */ if (hid_instance_count < 1) --- 776,780 ---- void hid_platform_specific_free(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_platform_specific_free"); /* only call this if the last instance is being freed */ if (hid_instance_count < 1) Index: hid_linux.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_linux.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** hid_linux.c 6 Apr 2006 16:50:42 -0000 1.14 --- hid_linux.c 27 May 2006 00:57:15 -0000 1.15 *************** *** 133,137 **** void hid_print_element_list(t_hid *x) { ! DEBUG(post("hid_print_element_list");); unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; // char event_type_string[256]; --- 133,137 ---- void hid_print_element_list(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_print_element_list"); unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; // char event_type_string[256]; *************** *** 253,257 **** void hid_print_device_list(void) { ! DEBUG(post("hid_print_device_list");); int i,fd; char device_output_string[256] = "Unknown"; --- 253,257 ---- void hid_print_device_list(void) { ! debug_print(LOG_DEBUG,"hid_print_device_list"); int i,fd; char device_output_string[256] = "Unknown"; *************** *** 351,355 **** t_int hid_get_events(t_hid *x) { ! DEBUG(post("hid_get_events");); /* for debugging, counts how many events are processed each time hid_read() is called */ --- 351,355 ---- t_int hid_get_events(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_get_events"); /* for debugging, counts how many events are processed each time hid_read() is called */ *************** *** 412,416 **** t_int hid_open_device(t_hid *x, t_int device_number) { ! DEBUG(post("hid_open_device");); char device_name[256] = "Unknown"; --- 412,416 ---- t_int hid_open_device(t_hid *x, t_int device_number) { ! debug_print(LOG_DEBUG,"hid_open_device"); char device_name[256] = "Unknown"; *************** *** 454,458 **** t_int hid_close_device(t_hid *x) { ! DEBUG(post("hid_close_device");); if (x->x_fd <0) return 0; --- 454,458 ---- t_int hid_close_device(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_close_device"); if (x->x_fd <0) return 0; *************** *** 463,467 **** t_int hid_build_device_list(t_hid *x) { ! DEBUG(post("hid_build_device_list");); /* the device list should be refreshed here */ /* --- 463,467 ---- t_int hid_build_device_list(t_hid *x) { ! debug_print(LOG_DEBUG,"hid_build_device_list"); /* the device list should be refreshed here */ /* Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/TODO,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** TODO 27 Jun 2005 00:27:53 -0000 1.20 --- TODO 27 May 2006 00:57:15 -0000 1.21 *************** *** 1,2 **** --- 1,13 ---- + + + + TODO: make open functions: + + device number + vendor_id product_id + Product String + + + ============================================================================== = test verbose names *************** *** 24,38 **** ============================================================================== ! = make fake names in input_arrays.c ! Instead of having "NULL" names, make up names using the event type, and the ! code number, i.e. abs_41, rel_15 ============================================================================== ! = check out GDAM HID implementation - - GDAM has a HID Manager implementation and probably a Linux one too --- 35,59 ---- ============================================================================== ! = hid/serial ! - open/close status outlet ! ! - [send ( to send data + - [tgl] 1/0 for open/close ============================================================================== ! = linux input synch events (EV_SYN) ! ! - these seem to be generated by the Linux kernel, so they probably don't fit ! in with the [hid] scheme. Probably the best thing is to ditch them, or ! figure out whether they should be used in controlling the flow of event ! data, as they are intended. ! ! ! ============================================================================== ! = open/close status outlet *************** *** 40,45 **** = profile [hid] object and usage ! - find out how much more CPU the names (btn_?, abs, rel, etc) use over using ! just floats. --- 61,66 ---- = profile [hid] object and usage ! - find out if [autoscale] takes a lot of CPU power, or where in [hid] is using ! CPU where it doesn't have to be *************** *** 57,60 **** --- 78,87 ---- + ============================================================================== + = device 0 gets events for all available devices + + - it might be useful to have device #0 open all available devices and output + the events. + ============================================================================== *************** *** 87,97 **** - most functions probably do not need return values - - return (1) seems to be the default on many functions - ============================================================================== = control input messages ! - are [poll(, [start(, and [stop( needed? is 0/1/del# enough? --- 114,122 ---- - most functions probably do not need return values ============================================================================== = control input messages ! - are [poll(, [start(, and [stop( needed? is 0/1/delay# enough? *************** *** 105,109 **** = event name changes ! - make key/button Type btn rather than key (undecided on this one) --- 130,134 ---- = event name changes ! - make key/button Type "button" rather than "key" (undecided on this one) *************** *** 120,130 **** ============================================================================== - = device 0 gets events for all available devices - - - it might be useful to have device #0 open all available devices and output - the events. - - - ============================================================================== = figure out whole degree issue --- 145,148 ---- *************** *** 161,164 **** --- 179,187 ---- http://www.2dcurves.com + ============================================================================== + = check out using USB timestamp + + - use the USB timestamp to correctly space the output data + /++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\ *************** *** 169,172 **** --- 192,202 ---- ______________________________________________________________________________ + - BUG: figure out how to prevent segfaults on mismapped devices/elements + + - it should gracefully ignore things where it currently segfaults + + - looks like its in build_device_list + + ______________________________________________________________________________ - BUG: multiple instances pointing to the same device don't have seperate close/free *************** *** 185,188 **** --- 215,220 ---- access. It must since its used with games. + - turn off/unlink mousepointer for that device? + ______________________________________________________________________________

1 0

externals/hcs/hid Makefile,1.13,1.14
by Hans-Christoph Steiner 26 May '06

26 May '06

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21687 Modified Files: Makefile Log Message: thought I'd check in a working(?) version of this makefile before I wipe it and use externals/Makefile Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 6 Apr 2006 15:55:39 -0000 1.13 --- Makefile 26 May 2006 14:31:28 -0000 1.14 *************** *** 1,15 **** ! TARGET=hid default: ! make -C ../../ $(TARGET) install: ! make -C ../../ $(TARGET)_install clean: ! make -C ../../ $(TARGET)_clean ! ! # this stuff below probably works, but its not maintained anymore since I use # externals/Makefile --- 1,19 ---- ! TARGET := `pwd|sed 's|.*/$.*$$|\1|'` ! EXTERNALS_ROOT := `pwd | sed 's|^$/.*externals$.*|\1|'` default: ! make -C $(EXTERNALS_ROOT) $(TARGET) install: ! make -C $(EXTERNALS_ROOT) $(TARGET)_install clean: ! make -C $(EXTERNALS_ROOT) $(TARGET)_clean + #============================================================================== + #============================================================================== + #============================================================================== + #============================================================================== + #============================================================================== # this stuff below probably works, but its not maintained anymore since I use # externals/Makefile *************** *** 51,55 **** # ----------------------- Windows MinGW ----------------------- ! ifeq ($(OS_NAME),win) EXTENSION = dll CFLAGS += -mms-bitfields --- 55,59 ---- # ----------------------- Windows MinGW ----------------------- ! ifeq ($(OS_NAME),windows) EXTENSION = dll CFLAGS += -mms-bitfields *************** *** 71,74 **** --- 75,79 ---- STRIP = strip -x hid.$(EXTENSION): input_arrays hid_utilites $(OBJ) + .SUFFIXES: .pd_darwin endif *************** *** 78,82 **** # ----------------------- GENERAL --------------------------------------------- - # generic optimization OPT_FLAGS = -O3 -ffast-math --- 83,86 ----

1 0

pd/src/locale english.tcl, 1.1.2.10, 1.1.2.11 deutsch.tcl, 1.1.2.10, 1.1.2.11
by Mathieu Bouchard 25 May '06

25 May '06

Update of /cvsroot/pure-data/pd/src/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16957 Modified Files: Tag: devel_0_39 english.tcl deutsch.tcl Log Message: . Index: english.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/locale/Attic/english.tcl,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** english.tcl 24 May 2006 11:19:01 -0000 1.1.2.10 --- english.tcl 25 May 2006 20:13:55 -0000 1.1.2.11 *************** *** 344,348 **** say outletfg "outlet color" say selrect "selection box" ! say test "poo" say canvasbgedit "canvas_test" --- 344,348 ---- say outletfg "outlet color" say selrect "selection box" ! say test "blahblah" say canvasbgedit "canvas_test" *************** *** 357,358 **** --- 357,360 ---- say popup_properties "Properties" say popup_help "Help" + say filter "Filter: " + say how_many_object_classes "%d of %d object classes" Index: deutsch.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/locale/Attic/deutsch.tcl,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** deutsch.tcl 26 Dec 2005 00:55:27 -0000 1.1.2.10 --- deutsch.tcl 25 May 2006 20:13:55 -0000 1.1.2.11 *************** *** 62,66 **** say_namespace summary { ! say_category IEMGUI say bng "Bang-Feld" say tgl "Schalter" --- 62,66 ---- say_namespace summary { ! say_category "IEMGUI" say bng "Bang-Feld" say tgl "Schalter" *************** *** 74,78 **** say dropper "\"Drag-and-Drop\" Box" ! say_category GLUE say bang "Bang-Nachricht ausgeben" say float "Zahl speichern und abrufen" --- 74,78 ---- say dropper "\"Drag-and-Drop\" Box" ! say_category "GLUE" say bang "Bang-Nachricht ausgeben" say float "Zahl speichern und abrufen" *************** *** 95,99 **** say value "gemeinsamer Zahlenspeicher" ! say_category TIME say delay "verzögert Nachrichten" say metro "sendet Nachrichten im Takt" --- 95,99 ---- say value "gemeinsamer Zahlenspeicher" ! say_category "TIME" say delay "verzögert Nachrichten" say metro "sendet Nachrichten im Takt" *************** *** 104,108 **** say pipe "dynamisch verlängerbare Verzögerungsstrecke" ! say_category MATH say + "addieren" say - "subtrahieren" --- 104,108 ---- say pipe "dynamisch verlängerbare Verzögerungsstrecke" ! say_category "MATH" say + "addieren" say - "subtrahieren" *************** *** 136,140 **** say clip "Begrenzung einer Zahlenreihe" ! say_category MIDI say {notein ctlin pgmin bendin touchin polytouchin midiin sysexin} \ "MIDI Eingang" --- 136,140 ---- say clip "Begrenzung einer Zahlenreihe" ! say_category "MIDI" say {notein ctlin pgmin bendin touchin polytouchin midiin sysexin} \ "MIDI Eingang" *************** *** 145,149 **** say stripnote "entferne \"note off\" Nachrichten" ! say_category TABLES say tabread "liest Zahl aus einer Tabelle" say tabread4 "liest Zahl aus einer Tabelle, mit 4-Punkt-Interpolation" --- 145,149 ---- say stripnote "entferne \"note off\" Nachrichten" ! say_category "TABLES" say tabread "liest Zahl aus einer Tabelle" say tabread4 "liest Zahl aus einer Tabelle, mit 4-Punkt-Interpolation" *************** *** 151,155 **** say soundfiler "schreibt und liest Samples in/aus einer Tabelle" ! say_category MISC say loadbang "Bang beim Öffnen der Datei" say serial "Serielle Schnittstelle, nur NT" --- 151,155 ---- say soundfiler "schreibt und liest Samples in/aus einer Tabelle" ! say_category "MISC" say loadbang "Bang beim Öffnen der Datei" say serial "Serielle Schnittstelle, nur NT" *************** *** 165,169 **** say keyname "Symbolischer Tastenname" ! say_category AUDIO MATH foreach word {+ - * /} {say $word~ "[say $word] (für Audiosignale)"} say max~ "Maximum eines Audiosignals" --- 165,169 ---- say keyname "Symbolischer Tastenname" ! say_category "AUDIO MATH" foreach word {+ - * /} {say $word~ "[say $word] (für Audiosignale)"} say max~ "Maximum eines Audiosignals" *************** *** 273,274 **** --- 273,277 ---- say cannot "kann nicht" + + say filter "Filter" ;# sorry + say how_many_object_classes "%d/%d"

1 0

externals/ggee/control shell.c,1.10,1.11
by Hans-Christoph Steiner 25 May '06

25 May '06

Update of /cvsroot/pure-data/externals/ggee/control In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5451 Modified Files: shell.c Log Message: ifdef'ed so it doesn't get compiled on Windows, since it doesn't compile anyway Index: shell.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/control/shell.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** shell.c 28 Feb 2006 09:31:48 -0000 1.10 --- shell.c 25 May 2006 19:42:05 -0000 1.11 *************** *** 1,9 **** /* (C) Guenter Geiger <geiger(a)epy.co.at> */ #include <m_pd.h> - #ifdef _MSC_VER - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4305 ) - #endif #include <unistd.h> --- 1,8 ---- /* (C) Guenter Geiger <geiger(a)epy.co.at> */ + /* this doesn't run on Windows (yet?) */ + #ifndef _WIN32 + #include <m_pd.h> #include <unistd.h> *************** *** 311,312 **** --- 310,314 ---- + #endif /* _WIN32 */ + +

1 0

externals/build/src bfft~.c, 1.5, 1.6 ibfft~.c, 1.5, 1.6 junction~.c, 1.5, 1.6
by Hans-Christoph Steiner 25 May '06

25 May '06

Update of /cvsroot/pure-data/externals/build/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19916 Modified Files: bfft~.c ibfft~.c junction~.c Log Message: fixed typo caused by wild sed replacement Index: junction~.c =================================================================== RCS file: /cvsroot/pure-data/externals/build/src/junction~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** junction~.c 25 May 2006 18:10:15 -0000 1.5 --- junction~.c 25 May 2006 18:52:17 -0000 1.6 *************** *** 4,8 **** */ #ifdef WIN32 ! #include "../../../pd/src/d_mayer_fft~.c" #endif --- 4,8 ---- */ #ifdef WIN32 ! #include "../../../pd/src/d_mayer_fft.c" #endif Index: bfft~.c =================================================================== RCS file: /cvsroot/pure-data/externals/build/src/bfft~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** bfft~.c 25 May 2006 18:10:15 -0000 1.5 --- bfft~.c 25 May 2006 18:52:17 -0000 1.6 *************** *** 4,8 **** */ #ifdef WIN32 ! #include "../../../pd/src/d_mayer_fft~.c" #endif --- 4,8 ---- */ #ifdef WIN32 ! #include "../../../pd/src/d_mayer_fft.c" #endif Index: ibfft~.c =================================================================== RCS file: /cvsroot/pure-data/externals/build/src/ibfft~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ibfft~.c 25 May 2006 18:10:15 -0000 1.5 --- ibfft~.c 25 May 2006 18:52:17 -0000 1.6 *************** *** 4,8 **** */ #ifdef WIN32 ! #include "../../../pd/src/d_mayer_fft~.c" #endif --- 4,8 ---- */ #ifdef WIN32 ! #include "../../../pd/src/d_mayer_fft.c" #endif

1 0

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 May 2006