Pd-cvs November 2004

pd-cvs@lists.iem.at

12 participants
283 discussions

externals/bbogart/popup popup.c,1.7,1.8
by B. Bogart 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/externals/bbogart/popup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14554/popup Modified Files: popup.c Log Message: Added revision keywords to initial post message Index: popup.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/popup.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** popup.c 5 Nov 2004 15:44:44 -0000 1.7 --- popup.c 7 Nov 2004 17:53:46 -0000 1.8 *************** *** 433,439 **** x->x_height = 25; ! if (argc < 4) { ! post("popup: You must enter at least 4 arguments. Default values used."); x->x_width = 124; x->x_height = 25; --- 433,439 ---- x->x_height = 25; ! if (argc < 5) { ! post("popup: You must enter at least 5 arguments. Default values used.\n\nArguments:\npopup [width] [height] [colour] [name] [option-1] [option-2] ..."); x->x_width = 124; x->x_height = 25; *************** *** 507,511 **** #endif ! post("Popup v0.1 Ben Bogart."); } --- 507,511 ---- #endif ! post("Popup v0.1 Ben Bogart.\nCVS: $Revision$ $Date$"); }

1 0

externals/bbogart/entry entry.c,1.2,1.3
by B. Bogart 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/externals/bbogart/entry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14554/entry Modified Files: entry.c Log Message: Added revision keywords to initial post message Index: entry.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/entry/entry.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** entry.c 17 Oct 2004 01:22:55 -0000 1.2 --- entry.c 7 Nov 2004 17:53:35 -0000 1.3 *************** *** 432,436 **** #endif ! post("Text v0.1 Ben Bogart."); } --- 432,436 ---- #endif ! post("Text v0.1 Ben Bogart.\nCVS: $Revision$ $Date$"); }

1 0

pd/src s_audio_asio.cpp,1.1.4.4,1.1.4.5
by Thomas Grill 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3643/src Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: aligned buffers and SIMD copying/zeroing more code cleanups Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** s_audio_asio.cpp 7 Nov 2004 13:47:05 -0000 1.1.4.4 --- s_audio_asio.cpp 7 Nov 2004 17:01:34 -0000 1.1.4.5 *************** *** 23,26 **** --- 23,27 ---- extern "C" { #include "s_stuff.h" + #include "m_simd.h" } *************** *** 82,89 **** static void Int32tofloat32_S(void* inbuffer, void* outbuffer, long frames); - /* Swap LSB to MSB and vice versa */ - #define SWAPLONG(v) ((((v)>>24)&0xFF)|(((v)>>8)&0xFF00)|(((v)&0xFF00)<<8)|(((v)&0xFF)<<24)) - #define SWAPSHORT(v) ((((v)>>8)&0xFF)|(((v)&0xFF)<<8)) - typedef void converter_t(void* inbuffer, void* outbuffer, long frames); --- 83,86 ---- *************** *** 358,365 **** /* calculate ringbuffer length */ - asio_ringbuffer_length = asio_bufsize * DEFDACBLKSIZE; - /* a strange way to find the least common multiple, * but works, since DEFDACBLKSIZE (expt 2 x) */ while ( !(asio_ringbuffer_length % DEFDACBLKSIZE) && !(asio_ringbuffer_length % asio_bufsize)) --- 355,362 ---- /* calculate ringbuffer length */ /* a strange way to find the least common multiple, * but works, since DEFDACBLKSIZE (expt 2 x) */ + + asio_ringbuffer_length = asio_bufsize * DEFDACBLKSIZE; while ( !(asio_ringbuffer_length % DEFDACBLKSIZE) && !(asio_ringbuffer_length % asio_bufsize)) *************** *** 378,382 **** for (i = 0; i != channels; ++i) { ! asio_ringbuffer[i] = (t_sample*)getbytes(asio_ringbuffer_length * sizeof (t_sample)); if (!asio_ringbuffer[i]) error("ASIO: couldn't allocate ASIO ringbuffer"); --- 375,379 ---- for (i = 0; i != channels; ++i) { ! asio_ringbuffer[i] = (t_sample*)getalignedbytes(asio_ringbuffer_length * sizeof (t_sample)); if (!asio_ringbuffer[i]) error("ASIO: couldn't allocate ASIO ringbuffer"); *************** *** 384,397 **** } ! ! /* initialize ringbuffer stuff */ asio_ringbuffer_inoffset = asio_ringbuffer_outoffset = 0; if (ASIOStart() == ASE_OK) post("ASIO: started"); else post("ASIO: couldn't start"); - - return; } --- 381,392 ---- } ! /* initialize ringbuffer pointers */ asio_ringbuffer_inoffset = asio_ringbuffer_outoffset = 0; + if (ASIOStart() == ASE_OK) post("ASIO: started"); else post("ASIO: couldn't start"); } *************** *** 409,418 **** if(asio_useoutputready) { ! // the DMA buffers would be playing past ASIOStop // -> clear output buffers and notify driver #if 0 ! // slow method for(i = 0; i != sys_outchannels; ++i) ! memset(asio_ringbuffer[i], 0, asio_ringbuffer_length * sizeof (t_sample)); // wait for bufferswitch to process silence (twice) pthread_cond_wait(&asio_ringbuf_cond, &asio_ringbuf_mutex); --- 404,413 ---- if(asio_useoutputready) { ! // the DMA buffers would be played past ASIOStop // -> clear output buffers and notify driver #if 0 ! // slow, blocking method for(i = 0; i != sys_outchannels; ++i) ! zerovec_simd(asio_ringbuffer[i], asio_ringbuffer_length); // wait for bufferswitch to process silence (twice) pthread_cond_wait(&asio_ringbuf_cond, &asio_ringbuf_mutex); *************** *** 442,446 **** for (i = 0; i != channels; i++) ! freebytes(asio_ringbuffer[i], asio_ringbuffer_length * sizeof (t_sample)); freebytes(asio_ringbuffer, channels * sizeof (t_sample *)); --- 437,441 ---- for (i = 0; i != channels; i++) ! freealignedbytes(asio_ringbuffer[i], asio_ringbuffer_length * sizeof (t_sample)); freebytes(asio_ringbuffer, channels * sizeof (t_sample *)); *************** *** 468,472 **** asio_driver = NULL; } - return; } --- 463,466 ---- *************** *** 489,497 **** } ! /* called on every dac~ send * todo: - * - use vectorized functions * - function pointer to avoid segfaults */ int asio_send_dacs(void) --- 483,496 ---- } ! #if SIMD_CHKCNT(DEFDACBLKSIZE) ! inline void copyblock(t_sample *dst,t_sample *src) { copyvec_simd(dst,src,DEFDACBLKSIZE); } ! inline void zeroblock(t_sample *dst) { zerovec_simd(dst,DEFDACBLKSIZE); } ! #else ! inline void copyblock(t_sample *dst,t_sample *src) { memcpy(dst,src,DEFDACBLKSIZE*sizeof(t_sample)); } ! inline void zeroblock(t_sample *dst) { memset(dst,0,DEFDACBLKSIZE*sizeof(t_sample)); } ! #endif /* called on every dac~ send * todo: * - function pointer to avoid segfaults */ int asio_send_dacs(void) *************** *** 511,521 **** /* send sound to ringbuffer */ sp = sys_soundout; ! for (i = 0; i < sys_outchannels; i++) { ! memcpy(asio_ringbuffer[i] + asio_ringbuffer_inoffset, sp, ! DEFDACBLKSIZE*sizeof(t_sample)); ! memset(sp, 0, DEFDACBLKSIZE*sizeof(t_sample)); ! sp+=DEFDACBLKSIZE; ! } /* get sound from ringbuffer */ --- 510,519 ---- /* send sound to ringbuffer */ sp = sys_soundout; ! for (i = 0; i < sys_outchannels; i++) { ! copyblock(asio_ringbuffer[i] + asio_ringbuffer_inoffset, sp); ! zeroblock(sp); ! sp+=DEFDACBLKSIZE; ! } /* get sound from ringbuffer */ *************** *** 529,542 **** int offset = 2 * asio_bufsize; if (asio_ringbuffer_inoffset <= offset ) ! memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_length + ! asio_ringbuffer_inoffset - offset , ! DEFDACBLKSIZE*sizeof(t_sample)); else ! memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset - offset, ! DEFDACBLKSIZE*sizeof(t_sample)); ! #else /* working but higer latency */ ! memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset, ! DEFDACBLKSIZE*sizeof(t_sample)); ! #endif sp+=DEFDACBLKSIZE; --- 527,536 ---- int offset = 2 * asio_bufsize; if (asio_ringbuffer_inoffset <= offset ) ! copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_length + ! asio_ringbuffer_inoffset - offset); else ! copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset - offset); ! #else /* working but higher latency */ ! copyblock(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset); #endif sp+=DEFDACBLKSIZE; *************** *** 545,549 **** asio_ringbuffer_inoffset += DEFDACBLKSIZE; - if (asio_ringbuffer_inoffset >= asio_ringbuffer_outoffset + asio_bufsize) { --- 539,542 ---- *************** *** 590,603 **** { case kAsioSelectorSupported: ! return 1L; case kAsioEngineVersion: return ASIOVERSION; case kAsioResetRequest: /* how to handle this without changing the dsp scheduler? */ return 1L; case kAsioBufferSizeChange: /* todo */ return 0L; /* should be 1 */ case kAsioResyncRequest: return 0L; case kAsioLatenciesChanged: --- 583,604 ---- { case kAsioSelectorSupported: ! if( ! value == kAsioResetRequest || ! value == kAsioSupportsTimeInfo ! ) ! return 1L; ! return 0L; case kAsioEngineVersion: return ASIOVERSION; case kAsioResetRequest: /* how to handle this without changing the dsp scheduler? */ + post("ASIO: Reset request"); return 1L; case kAsioBufferSizeChange: /* todo */ + post("ASIO: Buffer size changed"); return 0L; /* should be 1 */ case kAsioResyncRequest: + post("ASIO: Resync request"); return 0L; case kAsioLatenciesChanged: *************** *** 650,653 **** --- 651,655 ---- } } + pthread_cond_broadcast(&asio_ringbuf_cond); *************** *** 745,749 **** return Int32tofloat32_S; case ASIOSTFloat32MSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! float32tofloat32_S; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture return float32tofloat32; --- 747,751 ---- return Int32tofloat32_S; case ASIOSTFloat32MSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! return float32tofloat32_S; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture return float32tofloat32; *************** *** 849,855 **** #define SCALE_INT32 2147483647.f /* (- (expt 2 31) 1) */ static void float32tofloat32(void* inbuffer, void* outbuffer, long frames) { ! memcpy (outbuffer, inbuffer, frames* sizeof (float)); } --- 851,872 ---- #define SCALE_INT32 2147483647.f /* (- (expt 2 31) 1) */ + + /* Swap LSB to MSB and vice versa */ + inline __int32 swaplong(__int32 v) + { + return ((v>>24)&0xFF)|((v>>8)&0xFF00)|((v&0xFF00)<<8)|((v&0xFF)<<24); + } + + inline __int16 swapshort(__int16 v) + { + return ((v>>8)&0xFF)|((v&0xFF)<<8); + } + static void float32tofloat32(void* inbuffer, void* outbuffer, long frames) { ! if(SIMD_CHECK2(frames,inbuffer,outbuffer)) ! copyvec_simd((float *)outbuffer,(float *)inbuffer,frames); ! else ! memcpy (outbuffer, inbuffer, frames* sizeof (float)); } *************** *** 859,871 **** __int32* out = (__int32*)outbuffer; while (frames--) ! { ! __int32 reverse = *(in++); ! *out++ = SWAPLONG(reverse); ! } } static void float32tofloat64(void* inbuffer, void* outbuffer, long frames) { ! float *in = (float *)inbuffer; double* out = (double*)outbuffer; while (frames--) *(out++) = *(in++); --- 876,885 ---- __int32* out = (__int32*)outbuffer; while (frames--) ! *out++ = swaplong(*(in++)); } static void float32tofloat64(void* inbuffer, void* outbuffer, long frames) { ! const float *in = (const float *)inbuffer; double* out = (double*)outbuffer; while (frames--) *(out++) = *(in++); *************** *** 874,878 **** static void float64tofloat32(void* inbuffer, void* outbuffer, long frames) { ! double *in = (double *)inbuffer; float *out = (float *)outbuffer; while (frames--) *(out++) = *(in++); --- 888,892 ---- static void float64tofloat32(void* inbuffer, void* outbuffer, long frames) { ! const double *in = (const double *)inbuffer; float *out = (float *)outbuffer; while (frames--) *(out++) = *(in++); *************** *** 881,885 **** static void float32toInt16(void* inbuffer, void* outbuffer, long frames) { ! float *in = (float *)inbuffer; __int16* out = (__int16*)outbuffer; while (frames--) --- 895,899 ---- static void float32toInt16(void* inbuffer, void* outbuffer, long frames) { ! const float *in = (const float *)inbuffer; __int16* out = (__int16*)outbuffer; while (frames--) *************** *** 897,901 **** fld o fistp srt ! }; #endif *out++ = srt; --- 911,915 ---- fld o fistp srt ! } #endif *out++ = srt; *************** *** 905,909 **** static void Int16tofloat32(void* inbuffer, void* outbuffer, long frames) { ! __int16* in = (__int16*)inbuffer; float *out = (float *)outbuffer; while (frames--) --- 919,923 ---- static void Int16tofloat32(void* inbuffer, void* outbuffer, long frames) { ! const __int16* in = (const __int16*)inbuffer; float *out = (float *)outbuffer; while (frames--) *************** *** 913,917 **** static void float32toInt24(void* inbuffer, void* outbuffer, long frames) { ! float *in = (float *)inbuffer; __int32* out = (__int32*)outbuffer; while (frames--) --- 927,931 ---- static void float32toInt24(void* inbuffer, void* outbuffer, long frames) { ! const float *in = (const float *)inbuffer; __int32* out = (__int32*)outbuffer; while (frames--) *************** *** 921,925 **** float o = *(in++) * SCALE_INT24; #ifdef __GNUC__ ! *out++ = (__int32)lrintf(o); #else __int32 intg; --- 935,939 ---- float o = *(in++) * SCALE_INT24; #ifdef __GNUC__ ! __int32 intg = (__int32)lrintf(o); #else __int32 intg; *************** *** 928,934 **** fld o fistp intg ! }; ! *out++ = intg; #endif } } --- 942,948 ---- fld o fistp intg ! } #endif + *(out++) = intg; } } *************** *** 936,940 **** static void Int24tofloat32(void* inbuffer, void* outbuffer, long frames) { ! __int32* in = (__int32*)inbuffer; float *out = (float *)outbuffer; while (frames--) --- 950,954 ---- static void Int24tofloat32(void* inbuffer, void* outbuffer, long frames) { ! const __int32* in = (const __int32*)inbuffer; float *out = (float *)outbuffer; while (frames--) *************** *** 944,948 **** static void float32toInt32(void* inbuffer, void* outbuffer, long frames) { ! float *in = (float *)inbuffer; __int32* out = (__int32*)outbuffer; while (frames--) --- 958,962 ---- static void float32toInt32(void* inbuffer, void* outbuffer, long frames) { ! const float *in = (const float *)inbuffer; __int32* out = (__int32*)outbuffer; while (frames--) *************** *** 959,963 **** fld o fistp lng ! }; *out++ = lng; #endif --- 973,977 ---- fld o fistp lng ! } *out++ = lng; #endif *************** *** 967,971 **** static void Int32tofloat32(void* inbuffer, void* outbuffer, long frames) { ! __int32* in = (__int32*)inbuffer; float *out = (float *)outbuffer; while (frames--) --- 981,985 ---- static void Int32tofloat32(void* inbuffer, void* outbuffer, long frames) { ! const __int32* in = (const __int32*)inbuffer; float *out = (float *)outbuffer; while (frames--) *************** *** 975,979 **** static void float32toInt16_S(void* inbuffer, void* outbuffer, long frames) { ! float *in = (float *)inbuffer; __int16* out = (__int16*)outbuffer; while (frames--) --- 989,993 ---- static void float32toInt16_S(void* inbuffer, void* outbuffer, long frames) { ! const float *in = (const float *)inbuffer; __int16* out = (__int16*)outbuffer; while (frames--) *************** *** 991,997 **** fld o fistp reverse ! }; #endif ! *out++ = SWAPSHORT(reverse); } } --- 1005,1011 ---- fld o fistp reverse ! } #endif ! *out++ = swapshort(reverse); } } *************** *** 999,1014 **** static void Int16tofloat32_S(void* inbuffer, void* outbuffer, long frames) { ! __int16* in = (__int16*)inbuffer; float *out = (float *)outbuffer; while (frames--) ! { ! __int16 shin = *in++; ! *(out++) = (float)SWAPSHORT(shin) * (1.f / SCALE_INT16); ! } } static void float32toInt24_S(void* inbuffer, void* outbuffer, long frames) { ! float *in = (float *)inbuffer; char* out = (char*)outbuffer; while (frames--) --- 1013,1025 ---- static void Int16tofloat32_S(void* inbuffer, void* outbuffer, long frames) { ! const __int16* in = (const __int16*)inbuffer; float *out = (float *)outbuffer; while (frames--) ! *(out++) = (float)swapshort(*(in++)) * (1.f / SCALE_INT16); } static void float32toInt24_S(void* inbuffer, void* outbuffer, long frames) { ! const float *in = (const float *)inbuffer; char* out = (char*)outbuffer; while (frames--) *************** *** 1025,1029 **** fld o fistp reverse ! }; #endif out[2] = ((char *)&reverse)[0]; --- 1036,1040 ---- fld o fistp reverse ! } #endif out[2] = ((char *)&reverse)[0]; *************** *** 1036,1040 **** static void Int24tofloat32_S(void* inbuffer, void* outbuffer, long frames) { ! char* in = (char*)inbuffer; float *out = (float *)outbuffer; __int32 d = 0; --- 1047,1051 ---- static void Int24tofloat32_S(void* inbuffer, void* outbuffer, long frames) { ! const char* in = (const char*)inbuffer; float *out = (float *)outbuffer; __int32 d = 0; *************** *** 1051,1055 **** static void float32toInt32_S(void* inbuffer, void* outbuffer, long frames) { ! float *in = (float *)inbuffer; __int32* out = (__int32*)outbuffer; while (frames--) --- 1062,1066 ---- static void float32toInt32_S(void* inbuffer, void* outbuffer, long frames) { ! const float *in = (const float *)inbuffer; __int32* out = (__int32*)outbuffer; while (frames--) *************** *** 1066,1072 **** fld o fistp reverse ! }; #endif ! *out++ = SWAPLONG(reverse); } } --- 1077,1083 ---- fld o fistp reverse ! } #endif ! *out++ = swaplong(reverse); } } *************** *** 1074,1084 **** static void Int32tofloat32_S(void* inbuffer, void* outbuffer, long frames) { ! __int32* in = (__int32*)inbuffer; float *out = (float *)outbuffer; while (frames--) ! { ! __int32 lgin = *in++; ! *(out++) = (float)SWAPLONG(lgin) * (1.f / SCALE_INT32); ! } } --- 1085,1092 ---- static void Int32tofloat32_S(void* inbuffer, void* outbuffer, long frames) { ! const __int32* in = (const __int32*)inbuffer; float *out = (float *)outbuffer; while (frames--) ! *(out++) = (float)swaplong(*(in++)) * (1.f / SCALE_INT32); }

1 0

externals/hcs/hid TODO,1.2,1.3 hid-help.pd,1.7,1.8 hid.c,1.11,1.12 hid.h,1.8,1.9 hid_darwin.c,1.6,1.7 hid_linux.c,1.3,1.4 mouse-help.pd,1.2,1.3
by Hans-Christoph Steiner 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28595 Modified Files: TODO hid-help.pd hid.c hid.h hid_darwin.c hid_linux.c mouse-help.pd Log Message: cleaned up the code a fair amount, but there are still lots of bugs bugs bugs... Index: hid-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid-help.pd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** hid-help.pd 6 Nov 2004 21:15:04 -0000 1.7 --- hid-help.pd 7 Nov 2004 16:28:25 -0000 1.8 *************** *** 1,4 **** ! #N canvas 143 45 927 650 10; ! #X msg 390 265 ev_rel rel_x 0 4.08559e+09; #X obj 390 244 prepend set; #X obj 149 473 route rel_x rel_y; --- 1,4 ---- ! #N canvas 156 27 943 666 10; ! #X msg 390 265 ev_rel rel_x 2 3.57445e+09; #X obj 390 244 prepend set; #X obj 149 473 route rel_x rel_y; *************** *** 21,28 **** #X symbolatom 468 409 10 0 0 1 eventcode - -; #X symbolatom 438 428 15 0 0 1 eventtype - -; - #X floatatom 93 536 5 0 0 0 - - -; - #X floatatom 168 537 5 0 0 0 - - -; - #X obj 93 514 route key_f key_leftctrl btn_left; - #X floatatom 243 537 5 0 0 0 - - -; #X obj 177 296 bng 35 250 50 0 empty empty event_received 38 18 1 9 -225280 -1 -1; --- 21,24 ---- *************** *** 56,64 **** #X text 397 111 refresh device list; #X obj 248 225 hid 2; ! #X obj 337 514 unpack s f f; ! #X obj 376 532 tgl 25 0 empty empty any_button 27 13 1 9 -195568 -1 -1 0 1; ! #X obj 740 511 all_about_hid; ! #X text 631 512 For more info:; #X text 49 588 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; --- 52,60 ---- #X text 397 111 refresh device list; #X obj 248 225 hid 2; ! #X obj 94 524 unpack s f f; ! #X obj 133 542 tgl 25 0 empty empty any_button 27 13 1 9 -195568 -1 -1 0 1; ! #X obj 746 556 all_about_hid; ! #X text 637 557 For more info:; #X text 49 588 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; *************** *** 75,118 **** #X text 371 56 !!! This software is very much alpha \, so any aspect of it could change without notice !!!; #X connect 1 0 0 0; #X connect 2 0 3 0; #X connect 2 1 4 0; ! #X connect 5 0 51 0; ! #X connect 6 0 51 0; #X connect 8 0 19 0; #X connect 8 1 18 0; #X connect 8 2 17 0; #X connect 8 3 7 0; ! #X connect 9 0 51 0; ! #X connect 10 0 51 0; ! #X connect 11 0 51 0; ! #X connect 12 0 51 0; ! #X connect 13 0 51 0; ! #X connect 16 0 51 0; ! #X connect 22 0 20 0; ! #X connect 22 1 21 0; ! #X connect 22 2 23 0; ! #X connect 22 3 52 0; #X connect 41 0 40 0; ! #X connect 41 0 24 0; ! #X connect 42 0 41 1; ! #X connect 43 0 22 0; ! #X connect 43 1 2 0; ! #X connect 43 2 60 0; ! #X connect 43 3 46 0; ! #X connect 44 0 45 1; ! #X connect 45 0 44 0; ! #X connect 46 0 45 0; ! #X connect 47 0 51 0; ! #X connect 49 0 51 0; ! #X connect 51 0 41 0; ! #X connect 51 0 43 0; ! #X connect 51 0 1 0; ! #X connect 51 0 8 0; ! #X connect 52 1 53 0; ! #X connect 60 0 14 0; ! #X connect 60 1 15 0; ! #X connect 60 2 61 0; ! #X connect 62 0 51 0; ! #X connect 63 0 51 0; ! #X connect 66 0 51 0; --- 71,161 ---- #X text 371 56 !!! This software is very much alpha \, so any aspect of it could change without notice !!!; + #X text 650 400 REFRESH RATES; + #X text 660 415 ADB = 15.5 ms; + #X text 660 430 USB mice on Windows = 8-10 ms; + #X text 660 445 USB mice on GNU/Linux = 1-10 ms; + #X text 660 460 USB wireless mice = 12-20 ms; + #X text 660 475 PS/2 mouse = 5-25 ms; + #X text 660 490 P5 Glove = 22 ms; + #N canvas 0 22 454 304 JustFOrTestng 0; + #X msg 390 265 ev_rel rel_x 0 2.56485e+09; + #X obj 390 244 prepend set; + #X msg 148 77 start; + #X msg 174 96 stop; + #X msg 239 57 open 0; + #X msg 246 75 open 1; + #X msg 253 93 open 2; + #X msg 259 111 open 3; + #X msg 265 129 open 4; + #X obj 86 81 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 25 + ; + #X obj 223 266 spigot; + #X obj 269 266 tgl 17 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 + 1; + #X msg 336 136 close; + #X text 380 136 probably not needed; + #X msg 336 113 refresh; + #X text 397 111 refresh device list; + #X msg 398 180 poll 20; + #X msg 336 180 poll 2; + #X text 332 159 start polling and set the poll delay in ms; + #X msg 465 180 poll 2000; + #X text 371 56 !!! This software is very much alpha \, so any aspect + of it could change without notice !!!; + #X obj 248 225 hid 1; + #X connect 1 0 0 0; + #X connect 2 0 21 0; + #X connect 3 0 21 0; + #X connect 4 0 21 0; + #X connect 5 0 21 0; + #X connect 6 0 21 0; + #X connect 7 0 21 0; + #X connect 8 0 21 0; + #X connect 9 0 21 0; + #X connect 11 0 10 1; + #X connect 12 0 21 0; + #X connect 14 0 21 0; + #X connect 16 0 21 0; + #X connect 17 0 21 0; + #X connect 19 0 21 0; + #X connect 21 0 10 0; + #X connect 21 0 1 0; + #X restore 446 483 pd JustFOrTestng; #X connect 1 0 0 0; #X connect 2 0 3 0; #X connect 2 1 4 0; ! #X connect 5 0 47 0; ! #X connect 6 0 47 0; #X connect 8 0 19 0; #X connect 8 1 18 0; #X connect 8 2 17 0; #X connect 8 3 7 0; ! #X connect 9 0 47 0; ! #X connect 10 0 47 0; ! #X connect 11 0 47 0; ! #X connect 12 0 47 0; ! #X connect 13 0 47 0; ! #X connect 16 0 47 0; ! #X connect 37 0 36 0; ! #X connect 37 0 20 0; ! #X connect 38 0 37 1; ! #X connect 39 0 48 0; ! #X connect 39 1 2 0; ! #X connect 39 2 56 0; ! #X connect 39 3 42 0; ! #X connect 40 0 41 1; #X connect 41 0 40 0; ! #X connect 42 0 41 0; ! #X connect 43 0 47 0; ! #X connect 45 0 47 0; ! #X connect 47 0 37 0; ! #X connect 47 0 39 0; ! #X connect 47 0 1 0; ! #X connect 47 0 8 0; ! #X connect 48 1 49 0; ! #X connect 56 0 14 0; ! #X connect 56 1 15 0; ! #X connect 56 2 57 0; ! #X connect 58 0 47 0; ! #X connect 59 0 47 0; ! #X connect 62 0 47 0; Index: hid_linux.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_linux.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** hid_linux.c 25 Oct 2004 06:01:45 -0000 1.3 --- hid_linux.c 7 Nov 2004 16:28:25 -0000 1.4 *************** *** 38,44 **** */ ! t_int hid_output_events(t_hid *x) { ! DEBUG(post("hid_output_events");); /* for debugging, counts how many events are processed each time hid_read() is called */ --- 38,44 ---- */ ! 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 */ *************** *** 218,224 **** } ! t_int hid_devicelist_refresh(t_hid *x) { ! DEBUG(post("hid_devicelist_refresh");); /* the device list should be refreshed here */ /* --- 218,224 ---- } ! t_int hid_build_device_list(t_hid *x) { ! DEBUG(post("hid_build_device_list");); /* the device list should be refreshed here */ /* Index: hid.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** hid.c 6 Nov 2004 21:21:06 -0000 1.11 --- hid.c 7 Nov 2004 16:28:25 -0000 1.12 *************** *** 33,36 **** --- 33,46 ---- #define DEBUG(x) x + /* + * Various Max Refresh Rates: + ADB = 15.5 ms + USB mice on Windows = 8-10 ms + USB mice on GNU/Linux = 1-10 ms + USB wireless mice = 12-20 ms + PS/2 mouse = 5-25 ms + P5 Globe = 22 ms + */ + #define DEFAULT_DELAY 5 *************** *** 46,49 **** --- 56,97 ---- static void hid_float(t_hid* x, t_floatarg f); + + /*------------------------------------------------------------------------------ + * SUPPORT FUNCTIONS + */ + + void hid_output_event(t_hid *x, + char *type, char *code, t_float value, t_float timestamp) + { + t_atom event_data[4]; + + SETSYMBOL(event_data, gensym(type)); /* type */ + SETSYMBOL(event_data + 1, gensym(code)); /* code */ + SETFLOAT(event_data + 2, value); /* value */ + SETFLOAT(event_data + 3, timestamp); /* timestamp */ + + outlet_anything(x->x_obj.te_outlet,atom_gensym(event_data),3,event_data+1); + } + + void hid_set_from_float(t_hid *x, t_floatarg f) + { + /* values greater than 1 set the polling delay time */ + /* 1 and 0 for start/stop so you can use a [tgl] */ + if (f > 1) + { + 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 *************** *** 74,77 **** --- 122,126 ---- { post("[hid] closed device number %d",x->x_device_number); + x->x_device_open = 0; return (0); } *************** *** 81,115 **** t_int hid_open(t_hid *x, t_float f) { DEBUG(post("hid_open");); ! /* store running state so that it can be restored after the device has been opened */ ! t_int started = x->x_started; ! ! hid_close(x); ! /* set obj device name to parameter ! * otherwise set to default ! */ ! if (f > 0) ! x->x_device_number = f; ! else ! x->x_device_number = 0; ! if (hid_open_device(x,x->x_device_number)) ! { ! error("[hid] can not open device %d",x->x_device_number); ! post("\\=========================== [hid] ===========================/\n"); ! return (1); ! } /* restore the polling state so that when I [tgl] is used to start/stop [hid], ! * the [tgl]'s state will continue to accurately reflect [hid]'s state ! */ ! hid_float(x,started); ! post("\\=========================== [hid] ===========================/\n"); ! return (0); } --- 130,172 ---- + /* closed same device open */ + /* open same device no action */ + /* closed different device open */ + /* open different device close open */ + 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; ! if ( (f != x->x_device_number) && (x->x_device_open) ) hid_close(x); ! /* set obj device name to parameter otherwise set to default */ ! if (f > 0) ! x->x_device_number = f; ! else ! x->x_device_number = 0; ! ! 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); ! post("\\=========================== [hid] ===========================/\n"); ! return (1); ! } ! else ! { ! x->x_device_open = 1; ! } /* restore the polling state so that when I [tgl] is used to start/stop [hid], ! * the [tgl]'s state will continue to accurately reflect [hid]'s state */ ! hid_set_from_float(x,started); ! ! post("\\=========================== [hid] ===========================/\n"); ! return (0); } *************** *** 117,121 **** t_int hid_read(t_hid *x,int fd) { ! hid_output_events(x); if (x->x_started) --- 174,180 ---- t_int hid_read(t_hid *x,int fd) { ! // DEBUG(post("hid_read");); ! ! hid_get_events(x); if (x->x_started) *************** *** 148,167 **** DEBUG(post("hid_float");); ! /* values greater than 1 set the polling delay time */ ! /* 1 and 0 for start/stop so you can use a [tgl] */ ! if(f > 1) ! { ! 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); ! } } --- 207,211 ---- DEBUG(post("hid_float");); ! hid_set_from_float(x,f); } *************** *** 195,198 **** --- 239,243 ---- /* init vars */ + x->x_device_open = 0; x->x_started = 0; x->x_delay = DEFAULT_DELAY; *************** *** 204,208 **** /* find and report the list of devices */ ! hid_devicelist_refresh(x); /* Open the device and save settings. If there is an error, return the object --- 249,253 ---- /* 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 *************** *** 230,234 **** /* add inlet message methods */ ! class_addmethod(hid_class,(t_method) hid_devicelist_refresh,gensym("refresh"),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); --- 275,279 ---- /* add inlet message methods */ ! class_addmethod(hid_class,(t_method) hid_build_device_list,gensym("refresh"),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); Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TODO 6 Nov 2004 21:15:04 -0000 1.2 --- TODO 7 Nov 2004 16:28:25 -0000 1.3 *************** *** 1,13 **** ============================================================================== ! = define generic event struct (probably Pd-ized input_event ) ! something like: ! ! struct input_event { ! struct timeval time; ! t_int type; ! t_int code; ! t_int value; ! }; ! The question is whether the timeval is needed at all. Linux and Darwin --- 1,4 ---- ============================================================================== ! = define generic event timestamp struct (probably Pd-ized input_event ) The question is whether the timeval is needed at all. Linux and Darwin *************** *** 23,30 **** - Misc Input/Generic Desktop X == ev_rel/rel_x - Button Input/Button #1 == ev_key/btn_left - - LED UsagePage => ev_led LED Usages == Linux ev_led codes --- 14,17 ---- *************** *** 62,77 **** ============================================================================== - = raw values vs. calibrated - - - relative axes should probably be raw data, since its pixel data, but then - this causes problems with sensitivity across different mice. The mouse - sensitivity would probably best translate as resolution, ie calibrated data, - rather than sensitivity, ie raw data. - - - absolute axes should be calibrated, so that the same positions on different - devices map to the same value - - - ============================================================================== = pollfn for mouse-like devices --- 49,52 ---- *************** *** 84,88 **** - ============================================================================== = function return values --- 59,62 ---- Index: mouse-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/mouse-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mouse-help.pd 6 Nov 2004 21:15:04 -0000 1.2 --- mouse-help.pd 7 Nov 2004 16:28:25 -0000 1.3 *************** *** 1,3 **** ! #N canvas 138 201 676 441 10; #X symbolatom 233 198 0 0 0 0 - - -; #X obj 200 36 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 --- 1,3 ---- ! #N canvas 225 161 684 449 10; #X symbolatom 233 198 0 0 0 0 - - -; #X obj 200 36 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 *************** *** 31,34 **** --- 31,62 ---- #X msg 255 61 open 2; #X obj 200 91 mouse 1; + #N canvas 462 248 604 514 mouse-noise 0; + #X obj 90 55 inlet; + #X obj 113 173 mouse \$1; + #X obj 180 294 noise~; + #X obj 125 293 osc~; + #X obj 125 266 * 4000; + #X obj 113 367 *~; + #X msg 162 103 \; pd dsp 1; + #X obj 103 418 dac~; + #X obj 91 78 t f a b; + #X connect 0 0 8 0; + #X connect 1 0 5 0; + #X connect 1 1 4 0; + #X connect 2 0 5 1; + #X connect 3 0 5 1; + #X connect 4 0 3 0; + #X connect 5 0 7 0; + #X connect 5 0 7 1; + #X connect 8 0 5 0; + #X connect 8 1 1 0; + #X connect 8 2 6 0; + #X restore 464 163 pd mouse-noise 1; + #X msg 505 95 open 0; + #X msg 510 114 open 1; + #X msg 515 133 open 2; + #X obj 464 96 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 + ; + #X text 347 72 turn this on to make some noise with the mouse; #X connect 1 0 20 0; #X connect 9 0 6 0; *************** *** 49,50 **** --- 77,82 ---- #X connect 20 3 0 0; #X connect 20 4 2 0; + #X connect 22 0 21 0; + #X connect 23 0 21 0; + #X connect 24 0 21 0; + #X connect 25 0 21 0; Index: hid.h =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** hid.h 6 Nov 2004 21:21:06 -0000 1.8 --- hid.h 7 Nov 2004 16:28:25 -0000 1.9 *************** *** 28,36 **** t_symbol *x_devname; t_int x_device_number; - long x_locID; t_clock *x_clock; t_int x_delay; t_int x_started; t_int x_device_open; } t_hid; --- 28,36 ---- t_symbol *x_devname; t_int x_device_number; t_clock *x_clock; t_int x_delay; t_int x_started; t_int x_device_open; + t_int x_instance_count; } t_hid; *************** *** 49,57 **** */ /* generic, cross-platform functions */ t_int hid_open_device(t_hid *x, t_int device_number); t_int hid_close_device(t_hid *x); ! t_int hid_devicelist_refresh(t_hid* x); ! t_int hid_output_events(t_hid *x) ; void hid_platform_specific_free(t_hid *x); --- 49,61 ---- */ + /* support functions */ + void hid_output_event(t_hid *x, + char *type, char *code, t_float value, t_float timestamp); + /* generic, cross-platform functions */ 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_platform_specific_free(t_hid *x); Index: hid_darwin.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_darwin.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** hid_darwin.c 6 Nov 2004 21:15:04 -0000 1.6 --- hid_darwin.c 7 Nov 2004 16:28:25 -0000 1.7 *************** *** 44,55 **** #include "HID_Utilities_External.h" - #include "HID_Error_Handler.h" - /* - #include <IOKit/IOKitLib.h> - #include <IOKit/IOCFPlugIn.h> - #include <IOKit/hid/IOHIDLib.h> - #include <IOKit/hid/IOHIDKeys.h> - */ #include <IOKit/hid/IOHIDUsageTables.h> --- 44,48 ---- *************** *** 59,64 **** #include "hid.h" ! #define DEBUG(x) ! //#define DEBUG(x) x /*============================================================================== --- 52,57 ---- #include "hid.h" ! //#define DEBUG(x) ! #define DEBUG(x) x /*============================================================================== *************** *** 66,69 **** --- 59,63 ---- *======================================================================== */ + /*============================================================================== * FUNCTION PROTOTYPES *************** *** 74,82 **** char *convertEventsFromDarwinToLinux(pRecElement element); - /* IOKit HID Utilities functions from SC_HID.cpp */ - int prHIDBuildElementList(t_hid *x); - int prHIDBuildDeviceList(void); - int prHIDGetValue(void); - /*============================================================================== * EVENT TYPE/CODE CONVERSION FUNCTIONS --- 68,71 ---- *************** *** 84,118 **** */ - void convertDarwinToLinuxType(IOHIDElementType type, char *returnType) - { - switch (type) - { - case kIOHIDElementTypeInput_Misc: - sprintf(returnType, "ev_msc"); - break; - case kIOHIDElementTypeInput_Button: - sprintf(returnType, "ev_key"); - break; - case kIOHIDElementTypeInput_Axis: - sprintf(returnType, "ev_abs"); - break; - case kIOHIDElementTypeInput_ScanCodes: - sprintf(returnType, "undefined"); - break; - case kIOHIDElementTypeOutput: - sprintf(returnType, "undefined"); - break; - case kIOHIDElementTypeFeature: - sprintf(returnType, "undefined"); - break; - case kIOHIDElementTypeCollection: - sprintf(returnType, "undefined"); - break; - default: - HIDReportErrorNum("Unknown element type : ", type); - sprintf(returnType, "unknown"); - } - } - void convertAxis(pRecElement element, char *linux_type, char *linux_code, char axis) { --- 73,76 ---- *************** *** 129,132 **** --- 87,91 ---- } + void convertDarwinElementToLinuxTypeCode(pRecElement element, char *linux_type, char *linux_code) { *************** *** 151,154 **** --- 110,115 ---- case kHIDUsage_GD_Ry: convertAxis(element, linux_type, linux_code, 'y'); break; case kHIDUsage_GD_Rz: convertAxis(element, linux_type, linux_code, 'z'); break; + case kHIDUsage_GD_Wheel: + sprintf(linux_type,"ev_rel");sprintf(linux_code,"rel_wheel");break; } break; *************** *** 165,205 **** /* ============================================================================== */ - t_int hid_build_element_list(t_hid *x) - { - DEBUG(post("hid_build_element_list");); - - UInt32 i; - pRecElement devElement; - pRecDevice pCurrentHIDDevice; - UInt32 numElements; - char cstrElementName[256]; - - // look for the right device using locID - pCurrentHIDDevice = HIDGetFirstDevice (); - while (pCurrentHIDDevice && (pCurrentHIDDevice->locID != x->x_locID)) - pCurrentHIDDevice = HIDGetNextDevice (pCurrentHIDDevice); - if(!pCurrentHIDDevice) return (1); - - devElement = HIDGetFirstDeviceElement(pCurrentHIDDevice, kHIDElementTypeInput); - numElements = HIDCountDeviceElements(pCurrentHIDDevice, kHIDElementTypeInput); - - post("[hid] found %d elements:",numElements); - - for(i=0; i<numElements; i++) - { - //type - HIDGetTypeName((IOHIDElementType) devElement->type, cstrElementName); - post(" Type: %s %d 0x%x",cstrElementName,devElement->type,devElement->type); - convertDarwinToLinuxType((IOHIDElementType) devElement->type, cstrElementName); - post(" Type: %s %d 0x%x",cstrElementName,devElement->type,devElement->type); - //usage - HIDGetUsageName (devElement->usagePage, devElement->usage, cstrElementName); - post(" Usage/Code: %s %d 0x%x",cstrElementName,devElement->usage,devElement->usage); - - devElement = HIDGetNextDeviceElement (devElement, kHIDElementTypeInput); - } - return (0); - } - pRecDevice hid_get_device_by_number(t_int device_number) { --- 126,129 ---- *************** *** 228,238 **** } /* ============================================================================== */ /* Pd [hid] FUNCTIONS */ /* ============================================================================== */ ! t_int hid_output_events(t_hid *x) { ! DEBUG(post("hid_output_events");); SInt32 value; --- 152,195 ---- } + t_int hid_build_element_list(t_hid *x) + { + DEBUG(post("hid_build_element_list");); + + UInt32 i; + pRecElement pCurrentHIDElement; + pRecDevice pCurrentHIDDevice; + UInt32 numElements; + char type[256]; + char code[256]; + char type_name[256]; + char usage_name[256]; + + pCurrentHIDDevice = hid_get_device_by_number(x->x_device_number); + if(!pCurrentHIDDevice) return (1); + + pCurrentHIDElement = HIDGetFirstDeviceElement(pCurrentHIDDevice, kHIDElementTypeInput); + numElements = HIDCountDeviceElements(pCurrentHIDDevice, kHIDElementTypeInput); + + DEBUG(post("[hid] found %d elements:",numElements);); + + for(i=0; i<numElements; i++) + { + convertDarwinElementToLinuxTypeCode(pCurrentHIDElement,type,code); + HIDGetTypeName((IOHIDElementType) pCurrentHIDElement->type, type_name); + HIDGetUsageName(pCurrentHIDElement->usagePage, pCurrentHIDElement->usage, usage_name); + post("\tType: %s \t code: %s \t event name: \t %s, %s",type,code,type_name,usage_name); + + pCurrentHIDElement = HIDGetNextDeviceElement (pCurrentHIDElement, kHIDElementTypeInput); + } + return (0); + } + /* ============================================================================== */ /* Pd [hid] FUNCTIONS */ /* ============================================================================== */ ! t_int hid_get_events(t_hid *x) { ! //DEBUG(post("hid_get_events");); SInt32 value; *************** *** 248,259 **** Boolean result; ! // look for the right device: ! pCurrentHIDDevice = HIDGetFirstDevice (); ! while (pCurrentHIDDevice && (pCurrentHIDDevice->locID !=x->x_locID)) ! pCurrentHIDDevice = HIDGetNextDevice (pCurrentHIDDevice); ! if(!pCurrentHIDDevice) return (1); - // result = HIDGetEvent(pCurrentHIDDevice, (void*) &event); - // if(result) while( (HIDGetEvent(pCurrentHIDDevice, (void*) &event)) && (event_counter < 64) ) { --- 205,216 ---- Boolean result; ! pCurrentHIDDevice = hid_get_device_by_number(x->x_device_number); ! ! if(!pCurrentHIDDevice) ! { ! post("[hid] can't find current device %d. Was it unplugged?",x->x_device_number); ! return (1); ! } while( (HIDGetEvent(pCurrentHIDDevice, (void*) &event)) && (event_counter < 64) ) { *************** *** 268,274 **** DEBUG( - // convertDarwinToLinuxType((IOHIDElementType) pCurrentHIDElement->type, event_output_string); - HIDGetUsageName(pCurrentHIDElement->usagePage, pCurrentHIDElement->usage, event_output_string); - HIDGetElementNameFromVendorProductCookie( pCurrentHIDDevice->vendorID, pCurrentHIDDevice->productID, --- 225,228 ---- *************** *** 278,291 **** convertDarwinElementToLinuxTypeCode(pCurrentHIDElement,type,code); DEBUG(post("type: %s code: %s event name: %s",type,code,event_output_string);); - SETSYMBOL(event_data, gensym(type)); - /* code */ - SETSYMBOL(event_data + 1, gensym(code)); - /* value */ - SETFLOAT(event_data + 2, (t_float)value); - /* time */ - // TODO: convert this to a common time format, i.e. Linux struct timeval - SETFLOAT(event_data + 3, (t_float)(event.timestamp).lo); ! outlet_anything(x->x_obj.te_outlet,atom_gensym(event_data),3,event_data+1); ++event_counter; --- 232,238 ---- convertDarwinElementToLinuxTypeCode(pCurrentHIDElement,type,code); DEBUG(post("type: %s code: %s event name: %s",type,code,event_output_string);); ! // TODO: convert this to a common time format, i.e. Linux struct timeval ! hid_output_event(x,type,code,(t_float)value,(t_float)(event.timestamp).lo); ++event_counter; *************** *** 345,350 **** currentDevice = hid_get_device_by_number(device_number); - x->x_locID = currentDevice->locID; - post("[hid] opened device %d: %s %s", device_number, currentDevice->manufacturer, currentDevice->product); --- 292,295 ---- *************** *** 353,357 **** HIDQueueDevice(currentDevice); ! // TODO: queue all elements except absolute axes return (0); --- 298,302 ---- HIDQueueDevice(currentDevice); ! // TODO: queue all elements except absolute axes, those can just be polled return (0); *************** *** 367,452 **** } - t_int hid_devicelist_refresh(t_hid *x) - { - DEBUG(post("hid_devicelist_refresh");); - - /* the device list should be refreshed here */ - if ( (prHIDBuildDeviceList()) && (prHIDBuildElementList(x)) ) - return (0); - else - return (1); - } - - void hid_platform_specific_free(t_hid *x) - { - HIDReleaseAllDeviceQueues(); - HIDReleaseDeviceList(); - } ! /*============================================================================== ! * HID UTILIES FUNCTIONS FROM SC_HID.cpp ! *============================================================================== ! */ ! ! int prHIDBuildElementList(t_hid *x) ! { ! DEBUG(post("prHIDBuildElementList");); ! ! int locID = NULL; ! UInt32 i; ! pRecElement devElement; ! pRecDevice pCurrentHIDDevice; ! UInt32 numElements; ! char cstrElementName [256]; ! ! // Apple Trackpad locID for testing ! locID = 50397184; ! ! // look for the right device using locID ! pCurrentHIDDevice = HIDGetFirstDevice (); ! while (pCurrentHIDDevice && (pCurrentHIDDevice->locID != x->x_locID)) ! pCurrentHIDDevice = HIDGetNextDevice (pCurrentHIDDevice); ! if(!pCurrentHIDDevice) return (1); ! ! devElement = HIDGetFirstDeviceElement(pCurrentHIDDevice, kHIDElementTypeInput); ! numElements = HIDCountDeviceElements(pCurrentHIDDevice, kHIDElementTypeInput); ! ! post("[hid] found %d elements",numElements); ! ! for(i=0; i<numElements; i++) ! { ! //type ! HIDGetTypeName((IOHIDElementType) devElement->type, cstrElementName); ! post("Type: %s %d 0x%x",cstrElementName,devElement->type,devElement->type); ! //usage ! HIDGetUsageName (devElement->usagePage, devElement->usage, cstrElementName); ! post("Usage: %s %d 0x%x",cstrElementName,devElement->usage,devElement->usage); ! ! //devstring = newPyrString(g->gc, cstrElementName, 0, true); ! //SetObject(devElementArray->slots+devElementArray->size++, devstring); ! //g->gc->GCWrite(devElementArray, (PyrObject*) devstring); ! ! devElement = HIDGetNextDeviceElement (devElement, kHIDElementTypeInput); ! } ! return (0); ! } ! ! int prHIDBuildDeviceList(void) { ! DEBUG(post("prHIDBuildDeviceList");); int i,err; UInt32 usagePage, usage; - pRecElement devElement; pRecDevice pCurrentHIDDevice; - //pass in usage & usagepage - //kHIDUsage_GD_Joystick kHIDUsage_GD_GamePad - //usagePage = kHIDPage_GenericDesktop; - //usage = NULL; - Boolean result = HIDBuildDeviceList (NULL, NULL); // returns false if no device found - if(result) error("[hid]: no HID devices found\n"); --- 312,326 ---- } ! t_int hid_build_device_list(t_hid *x) { ! DEBUG(post("hid_build_device_list");); int i,err; UInt32 usagePage, usage; pRecDevice pCurrentHIDDevice; Boolean result = HIDBuildDeviceList (NULL, NULL); // returns false if no device found if(result) error("[hid]: no HID devices found\n"); *************** *** 455,524 **** if(!numdevs) return (0); - post("number of devices: %d", numdevs); char cstrDeviceName [256]; ! pCurrentHIDDevice = HIDGetFirstDevice(); ! for(i=numdevs - 1; i >= 0; --i) { ! post("Device %d: '%s' '%s' version %d",i, ! pCurrentHIDDevice->manufacturer,pCurrentHIDDevice->product,pCurrentHIDDevice->version); //usage ! HIDGetUsageName (pCurrentHIDDevice->usagePage, pCurrentHIDDevice->usage, cstrDeviceName); post(" vendorID: %d productID: %d locID: %d", ! pCurrentHIDDevice->vendorID,pCurrentHIDDevice->productID,pCurrentHIDDevice->locID); ! pCurrentHIDDevice = HIDGetNextDevice (pCurrentHIDDevice); ! } ! ! UInt32 outnum = HIDCountDeviceElements (pCurrentHIDDevice, kHIDElementTypeOutput); ! post("number of outputs: %d \n", outnum); ! return (0); } ! ! int prHIDGetValue(void) { ! DEBUG(post("hid_output_events");); ! ! int locID = NULL; ! int cookieNum = NULL; ! SInt32 value; ! /* ! PyrSlot *a = g->sp - 2; //class ! PyrSlot *b = g->sp - 1; //locID device ! PyrSlot *c = g->sp; //element cookie ! int locID, cookieNum; ! int err = slotIntVal(b, &locID); ! if (err) return err; ! err = slotIntVal(c, &cookieNum); ! if (err) return err; ! */ ! IOHIDElementCookie cookie = (IOHIDElementCookie) cookieNum; ! // look for the right device: ! pRecDevice pCurrentHIDDevice = HIDGetFirstDevice (); ! while (pCurrentHIDDevice && (pCurrentHIDDevice->locID !=locID)) ! pCurrentHIDDevice = HIDGetNextDevice (pCurrentHIDDevice); ! if(!pCurrentHIDDevice) return (1); ! ! ! // look for the right element: ! pRecElement pCurrentHIDElement = HIDGetFirstDeviceElement (pCurrentHIDDevice, kHIDElementTypeIO); ! // use gElementCookie to find current element ! while (pCurrentHIDElement && (pCurrentHIDElement->cookie != cookie)) ! pCurrentHIDElement = HIDGetNextDeviceElement (pCurrentHIDElement, kHIDElementTypeIO); ! ! ! if (pCurrentHIDElement) ! { ! value = HIDGetElementValue (pCurrentHIDDevice, pCurrentHIDElement); ! // if it's not a button and it's not a hatswitch then calibrate ! if(( pCurrentHIDElement->type != kIOHIDElementTypeInput_Button ) && ! ( pCurrentHIDElement->usagePage == 0x01 && pCurrentHIDElement->usage != kHIDUsage_GD_Hatswitch)) ! value = HIDCalibrateValue ( value, pCurrentHIDElement ); ! //SetInt(a, value); ! } ! //else SetNil(a); ! return (0); ! } --- 329,359 ---- if(!numdevs) return (0); char cstrDeviceName [256]; ! /* display device list in console */ ! for(i=0; i < numdevs; i++) { ! 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); post(" vendorID: %d productID: %d locID: %d", ! pCurrentHIDDevice->vendorID, ! pCurrentHIDDevice->productID, ! pCurrentHIDDevice->locID); ! // TODO: display all of the element types/codes for each device ! } ! ! return (0); } ! void hid_platform_specific_free(t_hid *x) { ! HIDReleaseAllDeviceQueues(); ! HIDReleaseDeviceList(); }

1 0

pd/src s_audio_asio.cpp,1.1.4.3,1.1.4.4
by Tim Blechmann 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27101 Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: experimental ringbuffer reading Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** s_audio_asio.cpp 7 Nov 2004 11:11:54 -0000 1.1.4.3 --- s_audio_asio.cpp 7 Nov 2004 13:47:05 -0000 1.1.4.4 *************** *** 46,49 **** --- 46,51 ---- #endif + #define ASIODEBUG + /* public function prototypes */ extern "C" void asio_open_audio(int naudioindev, int *audioindev, int nchindev, *************** *** 99,104 **** /* that's the sample width in bytes (per output channel) - ! it's only for silence when stopping the driver.... (please find a better solution) ! */ static int *asio_out_samplewidth = NULL; --- 101,106 ---- /* that's the sample width in bytes (per output channel) - ! * it's only for silence when stopping the driver.... (please find a better solution) ! */ static int *asio_out_samplewidth = NULL; *************** *** 146,149 **** --- 148,154 ---- static pthread_cond_t asio_ringbuf_cond = PTHREAD_COND_INITIALIZER; + /* some global definitions: */ + #define ASIOVERSION 2 /* i hope we are compatible with asio 2 */ + /* definitions from s_audio.c ... it should be save to use them */ #define DEVDESCSIZE 80 *************** *** 187,191 **** /* initialize ASIO */ asio_driver = (ASIODriverInfo*) getbytes (sizeof(ASIODriverInfo)); ! asio_driver->asioVersion = 2; /* i hope we are compatible with asio 2 */ #ifdef MSW --- 192,196 ---- /* initialize ASIO */ asio_driver = (ASIODriverInfo*) getbytes (sizeof(ASIODriverInfo)); ! asio_driver->asioVersion = ASIOVERSION; #ifdef MSW *************** *** 223,248 **** return; } post("ASIO initialized successfully"); ! /* query driver */ status = ASIOGetChannels(&asio_inchannels, &asio_outchannels); ASSERT(status == ASE_OK); post ("ASIOGetChannels\tinputs: %d, outputs: %d", asio_inchannels, asio_outchannels); - /* tb: todo: channel count hardcoded to asio hardware */ sys_inchannels = *chindev <= asio_inchannels ? *chindev : asio_inchannels; sys_outchannels = *choutdev <= asio_outchannels ? *choutdev : asio_outchannels; channels = sys_inchannels + sys_outchannels; ! status = ASIOGetBufferSize(&asio_minbufsize, &asio_maxbufsize, &asio_prefbufsize, &asio_granularity); ASSERT(status == ASE_OK); post ("ASIOGetBufferSize\tmin: %d, max: %d, preferred: %d, granularity: " "%d", asio_minbufsize, asio_maxbufsize, asio_prefbufsize, asio_granularity); /* todo: buffer size hardcoded to asio hardware */ --- 228,258 ---- return; } + #ifdef ASIODEBUG post("ASIO initialized successfully"); ! #endif /* query driver */ status = ASIOGetChannels(&asio_inchannels, &asio_outchannels); + #ifdef ASIODEBUG ASSERT(status == ASE_OK); post ("ASIOGetChannels\tinputs: %d, outputs: %d", asio_inchannels, asio_outchannels); + #endif sys_inchannels = *chindev <= asio_inchannels ? *chindev : asio_inchannels; sys_outchannels = *choutdev <= asio_outchannels ? *choutdev : asio_outchannels; channels = sys_inchannels + sys_outchannels; ! status = ASIOGetBufferSize(&asio_minbufsize, &asio_maxbufsize, &asio_prefbufsize, &asio_granularity); + + #ifdef ASIODEBUG ASSERT(status == ASE_OK); post ("ASIOGetBufferSize\tmin: %d, max: %d, preferred: %d, granularity: " "%d", asio_minbufsize, asio_maxbufsize, asio_prefbufsize, asio_granularity); + #endif /* todo: buffer size hardcoded to asio hardware */ *************** *** 279,284 **** /* prepare, create and set up buffers */ ! asio_bufferinfo = (ASIOBufferInfo*) getbytes (channels * sizeof (ASIOBufferInfo)); ! asio_channelinfo = (ASIOChannelInfo*) getbytes(channels * sizeof (ASIOChannelInfo)); if (!(asio_bufferinfo && asio_channelinfo)) { --- 289,296 ---- /* prepare, create and set up buffers */ ! asio_bufferinfo = (ASIOBufferInfo*) getbytes (channels * ! sizeof (ASIOBufferInfo)); ! asio_channelinfo = (ASIOChannelInfo*) getbytes(channels * ! sizeof (ASIOChannelInfo)); if (!(asio_bufferinfo && asio_channelinfo)) { *************** *** 310,314 **** --- 322,328 ---- == ASE_OK) { + #ifdef ASIODEBUG post("ASIO: buffers allocated"); + #endif } else *************** *** 391,395 **** int i; ! // pthread_cond_broadcast(&asio_ringbuf_cond); if(asio_useoutputready) --- 405,409 ---- int i; ! pthread_cond_broadcast(&asio_ringbuf_cond); if(asio_useoutputready) *************** *** 418,421 **** --- 432,437 ---- } + post("ASIO: close"); + status = ASIOStop(); ASSERT(status == ASE_OK); *************** *** 423,428 **** if (asio_driver) { for (i = 0; i != channels; i++) ! freebytes(asio_ringbuffer[i], asio_ringbuffer_length * sizeof (t_sample)); freebytes(asio_ringbuffer, channels * sizeof (t_sample *)); freebytes(asio_bufferinfo, channels * sizeof (ASIOBufferInfo)); --- 439,447 ---- if (asio_driver) { + ASIOStop(); + for (i = 0; i != channels; i++) ! freebytes(asio_ringbuffer[i], ! asio_ringbuffer_length * sizeof (t_sample)); freebytes(asio_ringbuffer, channels * sizeof (t_sample *)); freebytes(asio_bufferinfo, channels * sizeof (ASIOBufferInfo)); *************** *** 435,441 **** asio_channelinfo = NULL; ! if(asio_converter) freebytes(asio_converter, channels * sizeof (converter_t *)); asio_converter = NULL; ! if(asio_out_samplewidth) freebytes(asio_out_samplewidth, sys_outchannels * sizeof (int)); asio_out_samplewidth = NULL; --- 454,463 ---- asio_channelinfo = NULL; ! if(asio_converter) ! freebytes(asio_converter, channels * sizeof (converter_t *)); asio_converter = NULL; ! ! if(asio_out_samplewidth) ! freebytes(asio_out_samplewidth, sys_outchannels * sizeof (int)); asio_out_samplewidth = NULL; *************** *** 487,492 **** #endif - - /* send sound to ringbuffer */ sp = sys_soundout; --- 509,512 ---- *************** *** 503,509 **** for (j = 0; j < sys_inchannels; j++) { memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset, DEFDACBLKSIZE*sizeof(t_sample)); ! sp+=DEFDACBLKSIZE; } --- 523,544 ---- for (j = 0; j < sys_inchannels; j++) { + /* we should be able to read from the ringbuffer on a different position + * to reduce latency for asio buffer sizes that aren't multiples of 64... + * rethink this: */ + #if 0 + int offset = 2 * asio_bufsize; + if (asio_ringbuffer_inoffset <= offset ) + memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_length + + asio_ringbuffer_inoffset - offset , + DEFDACBLKSIZE*sizeof(t_sample)); + else + memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset - offset, + DEFDACBLKSIZE*sizeof(t_sample)); + #else /* working but higer latency */ memcpy(sp, asio_ringbuffer[i+j] + asio_ringbuffer_inoffset, DEFDACBLKSIZE*sizeof(t_sample)); ! ! #endif ! sp+=DEFDACBLKSIZE; } *************** *** 552,556 **** static long asio_messages(long selector, long value, void* message, double* opt) { ! /* todo */ return 0L; } --- 587,613 ---- static long asio_messages(long selector, long value, void* message, double* opt) { ! switch (selector) ! { ! case kAsioSelectorSupported: ! return 1L; ! case kAsioEngineVersion: ! return ASIOVERSION; ! case kAsioResetRequest: ! /* how to handle this without changing the dsp scheduler? */ ! return 1L; ! case kAsioBufferSizeChange: ! /* todo */ ! return 0L; /* should be 1 */ ! case kAsioResyncRequest: ! return 0L; ! case kAsioLatenciesChanged: ! /* we are not handling the latencies atm */ ! return 0L; ! case kAsioSupportsTimeInfo: ! return 1L; ! case kAsioSupportsTimeCode: ! /* we don't support that atm */ ! return 0L; ! } return 0L; } *************** *** 638,647 **** case ASIOSTInt32MSB: return float32toInt32_S; - case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture return float32tofloat32; case ASIOSTFloat32MSB: return float32tofloat32_S; - case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture return float32tofloat64; --- 695,702 ---- *************** *** 689,698 **** case ASIOSTInt32MSB: return Int32tofloat32_S; ! case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture return float32tofloat32; - case ASIOSTFloat32MSB: - return float32tofloat32_S; - case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture return float64tofloat32; --- 744,751 ---- case ASIOSTInt32MSB: return Int32tofloat32_S; ! case ASIOSTFloat32MSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! float32tofloat32_S; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture return float32tofloat32; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture return float64tofloat32; *************** *** 714,718 **** case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment default: ! post("Input sample Type %d not supported, yet!!!",format); return NULL; } --- 767,771 ---- case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment default: ! post("Input sample Type %d not supported, yet!!!",format); return NULL; } *************** *** 798,802 **** static void float32tofloat32(void* inbuffer, void* outbuffer, long frames) { ! memcpy (outbuffer, inbuffer, frames* sizeof (float)); /* check */ } --- 851,855 ---- static void float32tofloat32(void* inbuffer, void* outbuffer, long frames) { ! memcpy (outbuffer, inbuffer, frames* sizeof (float)); }

1 0

pd/src Makefile.am,1.1.4.2,1.1.4.3 u_main.tk,1.4.4.1,1.4.4.2
by Tim Blechmann 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13481/src Modified Files: Tag: devel_0_38 Makefile.am u_main.tk Log Message: build system and hcs's pd.tk fix Index: Makefile.am =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/Makefile.am,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** Makefile.am 6 Nov 2004 13:58:13 -0000 1.1.4.2 --- Makefile.am 7 Nov 2004 12:38:56 -0000 1.1.4.3 *************** *** 108,114 **** all-local: bin/pd.tk ! bin/pd.tk: ! echo set pd_nt @OSNUMBER@ > bin/pd.tk ! grep -v "set pd_nt" < u_main.tk >> bin/pd.tk install-exec-local: --- 108,113 ---- all-local: bin/pd.tk ! bin/pd.tk: u_main.tk ! install u_main.tk ./bin/pd.tk install-exec-local: Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** u_main.tk 5 Nov 2004 14:27:47 -0000 1.4.4.1 --- u_main.tk 7 Nov 2004 12:38:56 -0000 1.4.4.2 *************** *** 1,8 **** - set pd_nt 1 #!/usr/bin/wish - # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX. The first - # line is automatically munged by the relevant makefiles.) - # Copyright (c) 1997-1999 Miller Puckette. # For information on usage and redistribution, and for a DISCLAIMER OF ALL --- 1,4 ---- *************** *** 17,20 **** --- 13,32 ---- # all this changes are labeled with #######iemlib########## + + if { $tcl_platform(platform) == "windows" } { + set pd_nt 1 + puts stderr {Configuring for Windows} + } elseif {$tcl_platform(os) == "Darwin"} { + set pd_nt 2 + puts stderr {Configuring for MacOS X} + } else { + set pd_nt 0 + puts stderr {Configuring for UNIX} + } + + # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX. The first + # line is automatically munged by the relevant makefiles.) + + # Tearoff is set to true by default: set pd_tearoff 1

1 0

pd configure.ac,1.1.4.1,1.1.4.2
by Tim Blechmann 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13481 Modified Files: Tag: devel_0_38 configure.ac Log Message: build system and hcs's pd.tk fix Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/configure.ac,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** configure.ac 5 Nov 2004 13:23:19 -0000 1.1.4.1 --- configure.ac 7 Nov 2004 12:38:55 -0000 1.1.4.2 *************** *** 128,131 **** --- 128,134 ---- AC_DEFINE(GARRAY_THREAD_LOCK)) + AC_ARG_ENABLE(setuid, [ --enable-setuid install as setuid (linux)], + setuid=yes) + dnl compile features *************** *** 139,143 **** AC_ARG_ENABLE(icc, [ --enable-icc icc support], ! CC=icc; icc=yes) dnl linux specific part --- 142,146 ---- AC_ARG_ENABLE(icc, [ --enable-icc icc support], ! CC=icc; icc=yes; CFLAGS="-ip -ipo_obj "$CFLAGS; LDFLAGS="-ip -ipo_obj "$LDFLAGS) dnl linux specific part *************** *** 149,152 **** --- 152,156 ---- if test $ac_cv_lib_asound_snd_pcm_info == "yes"; then AC_LIBOBJ(s_audio_alsa) + AC_LIBOBJ(s_audio_alsamm) fi if test $simdcode; then *************** *** 154,157 **** --- 158,166 ---- fi + dnl setuid + if test $setuid == "yes"; then + binarymode="-m4755" + fi + dnl platform dependant AC_DEFINE(USEAPI_OSS) *************** *** 166,192 **** dnl optimization flags ! if test "$icc"; then ! if test "$optimize" == "pentium4"; then ! ARCH_CFLAGS="-xN -ip -ipo_obj" ! fi ! if test "$optimize" == "pentium3"; then ! ARCH_CFLAGS="-xK -ip -ipo_obj" ! fi ! else ! if test "$optimize" == "pentium4"; then ! ARCH_CFLAGS="-mtune=pentium4 -march=pentium4 -mmmx -msse -msse2 -mfpmath=sse" ! fi ! if test "$optimize" == "pentium3"; then ! ARCH_CFLAGS="-mtune=pentium3 -march=pentium3 -mmmx -msse -mfpmath=sse" ! fi ! if test "$optimize" == "pentium2"; then ! ARCH_CFLAGS="-mtune=pentium2 -march=pentium2 -mmmx"; ! CFLAGS=$CFLAGS" -DDONTUSESIMD" ! fi ! if test "$optimize" == "pentium"; then ! ARCH_CFLAGS="-mtune=pentium -march=pentium" ! CFLAGS=$CFLAGS" -DDONTUSESIMD" ! fi ! fi dnl several flags --- 175,195 ---- dnl optimization flags ! if test "$optimize" == "pentium4"; then ! ARCH_CFLAGS="-mtune=pentium4 -march=pentium4 -mmmx -msse -msse2 -mfpmath=sse" ! fi ! if test "$optimize" == "pentium3"; then ! ARCH_CFLAGS="-mtune=pentium3 -march=pentium3 -mmmx -msse -mfpmath=sse" ! fi ! if test "$optimize" == "athlon-xp"; then ! ARCH_CFLAGS="-mtune=athlon-xp -march=athlon-xp -mmmx -msse -mfpmath=sse" ! fi ! if test "$optimize" == "pentium2"; then ! ARCH_CFLAGS="-mtune=pentium2 -march=pentium2 -mmmx"; ! CFLAGS=$CFLAGS" -DDONTUSESIMD" ! fi ! if test "$optimize" == "pentium"; then ! ARCH_CFLAGS="-mtune=pentium -march=pentium" ! CFLAGS=$CFLAGS" -DDONTUSESIMD" ! fi dnl several flags *************** *** 251,254 **** --- 254,258 ---- AC_SUBST(GUINAME) AC_SUBST(OSNUMBER) + AC_SUBST(binarymode, -m755) AC_CONFIG_FILES([Makefile extra/Makefile

1 0

pd/src s_path.c,1.3.4.1,1.3.4.2
by Thomas Grill 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21631/src Modified Files: Tag: devel_0_38 s_path.c Log Message: sys_argparse prototype also for MSW Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** s_path.c 5 Nov 2004 14:27:47 -0000 1.3.4.1 --- s_path.c 7 Nov 2004 11:14:15 -0000 1.3.4.2 *************** *** 360,363 **** --- 360,365 ---- deprecated in favor of the "settings" mechanism */ + int sys_argparse(int argc, char **argv); + #ifndef MSW *************** *** 365,370 **** #define NUMARGS 1000 - int sys_argparse(int argc, char **argv); - int sys_rcfile(void) { --- 367,370 ----

1 0

pd/src s_file.c,1.2.4.1,1.2.4.2
by Thomas Grill 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21416/src Modified Files: Tag: devel_0_38 s_file.c Log Message: fixed strange usage of HKEY type Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** s_file.c 5 Nov 2004 14:27:47 -0000 1.2.4.1 --- s_file.c 7 Nov 2004 11:13:14 -0000 1.2.4.2 *************** *** 158,162 **** static int sys_getpreference(const char *key, char *value, int size) { ! HKEY **hkey; DWORD bigsize = size; char *val2 = value; --- 158,162 ---- static int sys_getpreference(const char *key, char *value, int size) { ! HKEY hkey; DWORD bigsize = size; char *val2 = value; *************** *** 193,197 **** static void sys_putpreference(const char *key, const char *value) { ! HKEY **hkey; LONG err = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "Software\\Pd", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, --- 193,197 ---- static void sys_putpreference(const char *key, const char *value) { ! HKEY hkey; LONG err = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "Software\\Pd", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE,

1 0

pd/src s_audio_asio.cpp,1.1.4.2,1.1.4.3
by Thomas Grill 07 Nov '04

07 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21090/src Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: code cleanups more assertions bug fixes and optimization for converter functions force silence at driver shutdown Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** s_audio_asio.cpp 6 Nov 2004 15:22:54 -0000 1.1.4.2 --- s_audio_asio.cpp 7 Nov 2004 11:11:54 -0000 1.1.4.3 *************** *** 12,15 **** --- 12,21 ---- #include "windows.h" /* for application window handle */ #define IEEE754_64FLOAT 1 + #else + #error This is for MS Windows (Intel CPU architecture) only!! + #endif + + #ifdef _MSC_VER + #pragma warning( disable : 4091 ) #endif [...1084 lines suppressed...] ! float *out = (float *)outbuffer; while (frames--) { ! __int32 lgin = *in++; ! *(out++) = (float)SWAPLONG(lgin) * (1.f / SCALE_INT32); } } *************** *** 867,871 **** /* some local helper functions */ ! inline void prepare_asio_drivernames(void) { if (asio_drivernames == NULL) --- 1032,1036 ---- /* some local helper functions */ ! static void prepare_asio_drivernames(void) { if (asio_drivernames == NULL)

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs November 2004