Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

externals/io/hidio/test latency_test.pd, NONE, 1.1 test_instance.pd, NONE, 1.1 test_instance_GUI.pd, NONE, 1.1
by Hans-Christoph Steiner 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/externals/io/hidio/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8060/test Added Files: latency_test.pd test_instance.pd test_instance_GUI.pd Log Message: added latency measuring code on Darwin (to be removed once testing is done), and removed threading --- NEW FILE: test_instance_GUI.pd --- #N canvas 115 434 475 227 10; #X obj 96 93 send test_control; #X obj 156 25 tgl 35 1 empty empty empty 0 -6 0 8 -24198 -1 -1 0 1 ; #X msg 89 44 clear; #X msg 38 44 write; #X msg 273 166 \; pd open \$1 \$2; #X obj 394 119 getdir; #X obj 273 119 symbol; #X msg 273 69 test_instance.pd; #X obj 273 95 trigger anything bang; #X obj 273 138 pack symbol symbol; #X obj 275 43 until; #X msg 275 20 4; #X msg 32 166 \; pd-test_instance.pd menuclose; #X connect 1 0 0 0; #X connect 2 0 0 0; #X connect 3 0 0 0; #X connect 5 0 9 1; #X connect 6 0 9 0; #X connect 7 0 8 0; #X connect 8 0 6 0; #X connect 8 1 5 0; #X connect 9 0 4 0; #X connect 10 0 7 0; #X connect 11 0 10 0; --- NEW FILE: test_instance.pd --- #N canvas 560 22 506 400 10; #X obj 251 334 textfile; #X obj 330 286 prepend add; #X msg 251 186 clear; #X msg 103 220 write \$1; #X obj 221 32 receive test_control; #X obj 28 125 route write clear; #X msg 400 185 open 0; #X msg 349 186 close; #X obj 349 242 prepend set; #X msg 350 262 key key_227 0; #X obj 26 187 makefilename /tmp/hid-%d.txt; #X msg 28 149 bang; #X obj 27 168 float \$0; #X symbolatom 26 247 0 0 0 0 - - -; #X obj 221 53 route float; #X obj 221 93 trigger float float; #X obj 349 114 select 0; #X obj 400 136 bang; #X obj 259 206 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #N canvas 4 22 552 367 subpatch 1; #X obj 264 314 textfile; #X obj 343 266 prepend add; #X msg 264 166 clear; #X msg 106 199 write \$1; #X obj 234 12 receive test_control; #X obj 31 104 route write clear; #X msg 413 165 open 0; #X msg 362 166 close; #X obj 362 222 prepend set; #X msg 363 242 key key_227 0; #X msg 31 128 bang; #X obj 30 147 float \$0; #X symbolatom 29 226 0 0 0 0 - - -; #X obj 234 33 route float; #X obj 234 73 trigger float float; #X obj 362 94 select 0; #X obj 413 116 bang; #X obj 272 186 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 29 166 makefilename /tmp/hid-%d-sub.txt; #X obj 343 194 hidio 0; #X connect 1 0 0 0; #X connect 2 0 0 0; #X connect 2 0 17 0; #X connect 3 0 0 0; #X connect 4 0 13 0; #X connect 5 0 10 0; #X connect 5 1 2 0; #X connect 6 0 19 0; #X connect 7 0 19 0; #X connect 8 0 9 0; #X connect 10 0 11 0; #X connect 11 0 18 0; #X connect 13 0 14 0; #X connect 13 1 5 0; #X connect 14 0 19 0; #X connect 14 1 15 0; #X connect 15 0 7 0; #X connect 15 1 16 0; #X connect 16 0 2 0; #X connect 16 0 6 0; #X connect 18 0 12 0; #X connect 18 0 3 0; #X connect 19 0 1 0; #X connect 19 0 8 0; #X restore 40 32 pd subpatch test; #X obj 330 214 hidio 0; #X connect 1 0 0 0; #X connect 2 0 0 0; #X connect 2 0 18 0; #X connect 3 0 0 0; #X connect 4 0 14 0; #X connect 5 0 11 0; #X connect 5 1 2 0; #X connect 6 0 20 0; #X connect 7 0 20 0; #X connect 8 0 9 0; #X connect 10 0 13 0; #X connect 10 0 3 0; #X connect 11 0 12 0; #X connect 12 0 10 0; #X connect 14 0 15 0; #X connect 14 1 5 0; #X connect 15 0 20 0; #X connect 15 1 16 0; #X connect 16 0 7 0; #X connect 16 1 17 0; #X connect 17 0 2 0; #X connect 17 0 6 0; #X connect 20 0 1 0; #X connect 20 0 8 0; --- NEW FILE: latency_test.pd --- #N canvas 0 22 474 324 10; #X msg 111 33 open 2; #X msg 194 18 poll 1; #X msg 52 88 info; #X obj 208 181 route poll; #X floatatom 209 206 5 0 0 0 - - -; #X msg 302 108 0; #X msg 205 65 poll 5; #X msg 206 89 poll 10; #X msg 201 41 poll 3; #X msg 210 111 poll 25; #X obj 175 153 hidio 2; #X connect 0 0 10 0; #X connect 1 0 10 0; #X connect 2 0 10 0; #X connect 3 0 4 0; #X connect 5 0 10 0; #X connect 6 0 10 0; #X connect 7 0 10 0; #X connect 8 0 10 0; #X connect 9 0 10 0; #X connect 10 1 3 0;

1 0

externals/io/hidio Makefile, 1.2, 1.3 TODO, 1.1, 1.2 hidio-help.pd, 1.3, 1.4 hidio.c, 1.13, 1.14 hidio.h, 1.11, 1.12 hidio_darwin.c, 1.4, 1.5 hidio_linux.c, 1.2, 1.3
by Hans-Christoph Steiner 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/externals/io/hidio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8060 Modified Files: Makefile TODO hidio-help.pd hidio.c hidio.h hidio_darwin.c hidio_linux.c Log Message: added latency measuring code on Darwin (to be removed once testing is done), and removed threading Index: hidio.h =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** hidio.h 21 Dec 2006 18:40:59 -0000 1.11 --- hidio.h 31 Dec 2006 22:49:16 -0000 1.12 *************** *** 4,8 **** #include <stdio.h> #ifdef _WIN32 - #include "pthread.h" /* needs pthread library */ #define LOG_DEBUG 7 #define LOG_INFO 6 --- 4,7 ---- *************** *** 12,16 **** #else #include <sys/syslog.h> - #include <pthread.h> #endif /* _WIN32 */ --- 11,14 ---- *************** *** 68,73 **** /* this is limited so that the object doesn't cause a click getting too many ! * events from the OS's event queue */ ! #define MAX_EVENTS_PER_POLL 64 /*------------------------------------------------------------------------------ --- 66,73 ---- /* this is limited so that the object doesn't cause a click getting too many ! * events from the OS's event queue. On Mac OS X, this is set in on the ! * kernel level in HID_Utilities_External.h with the constant ! * kDeviceQueueSize */ ! #define MAX_EVENTS_PER_POLL 50 /*------------------------------------------------------------------------------ *************** *** 94,104 **** #ifndef PD void *x_obex; ! #endif /* PD */ #ifdef _WIN32 HANDLE x_fd; ! #endif /* _WIN32 */ #ifdef __linux__ t_int x_fd; ! #endif /* __linux */ void *x_ff_device; short x_device_number; --- 94,104 ---- #ifndef PD void *x_obex; ! #endif #ifdef _WIN32 HANDLE x_fd; ! #endif #ifdef __linux__ t_int x_fd; ! #endif void *x_ff_device; short x_device_number; *************** *** 111,120 **** t_outlet *x_data_outlet; t_outlet *x_status_outlet; - t_int x_requestcode; - pthread_mutex_t x_mutex; - pthread_cond_t x_requestcondition; - pthread_cond_t x_answercondition; - pthread_t x_thread; - t_int x_priority; } t_hidio; --- 111,114 ---- *************** *** 187,191 **** extern void hidio_build_device_list(void); extern void hidio_get_events(t_hidio *x); ! extern void hidio_doprint(t_hidio* x); /* print info to the console */ extern void hidio_platform_specific_info(t_hidio* x); /* device info on the status outlet */ extern void hidio_platform_specific_free(t_hidio *x); --- 181,185 ---- extern void hidio_build_device_list(void); extern void hidio_get_events(t_hidio *x); ! extern void hidio_print(t_hidio* x); /* print info to the console */ extern void hidio_platform_specific_info(t_hidio* x); /* device info on the status outlet */ extern void hidio_platform_specific_free(t_hidio *x); Index: hidio.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** hidio.c 21 Dec 2006 18:40:59 -0000 1.13 --- hidio.c 31 Dec 2006 22:49:16 -0000 1.14 *************** *** 88,92 **** static void hidio_open(t_hidio *x, t_symbol *s, int argc, t_atom *argv); //static t_int hidio_close(t_hidio *x); - //static t_int hidio_child_read(t_hidio *x); //static void hidio_float(t_hidio* x, t_floatarg f); --- 88,91 ---- *************** *** 298,307 **** SETFLOAT(event_data + 1, output_data->instance); SETFLOAT(event_data + 2, output_data->value); ! #else atom_setsym(event_data, output_data->name); atom_setsym(event_data, output_data->name); atom_setlong(event_data + 1, (long)output_data->instance); atom_setlong(event_data + 2, (long)output_data->value); ! #endif outlet_anything(x->x_data_outlet, output_data->type, 3, event_data); } --- 297,306 ---- SETFLOAT(event_data + 1, output_data->instance); SETFLOAT(event_data + 2, output_data->value); ! #else /* Max */ atom_setsym(event_data, output_data->name); atom_setsym(event_data, output_data->name); atom_setlong(event_data + 1, (long)output_data->instance); atom_setlong(event_data + 2, (long)output_data->value); ! #endif /* PD */ outlet_anything(x->x_data_outlet, output_data->type, 3, event_data); } *************** *** 310,318 **** /* stop polling the device */ ! static void stop_poll(t_hidio* x) { ! debug_print(LOG_DEBUG,"stop_poll"); - pthread_mutex_lock(&x->x_mutex); if (x->x_started) { --- 309,316 ---- /* stop polling the device */ ! static void hidio_stop_poll(t_hidio* x) { ! debug_print(LOG_DEBUG,"hidio_stop_poll"); if (x->x_started) { *************** *** 321,325 **** x->x_started = 0; } - pthread_mutex_unlock(&x->x_mutex); } --- 319,322 ---- *************** *** 328,335 **** */ ! void hidio_poll(t_hidio* x, t_float f) { - pthread_mutex_lock(&x->x_mutex); debug_print(LOG_DEBUG,"hidio_poll"); --- 325,334 ---- */ ! /* TODO: poll time should be set based on how fast the OS is actually polling ! * the device, whether that is IOUSBEndpointDescriptor.bInterval, or something ! * else. ! */ void hidio_poll(t_hidio* x, t_float f) { debug_print(LOG_DEBUG,"hidio_poll"); *************** *** 343,349 **** if(!x->x_device_open) { - pthread_mutex_unlock(&x->x_mutex); hidio_open(x,ps_open,0,NULL); - pthread_mutex_lock(&x->x_mutex); } if(!x->x_started) --- 342,346 ---- *************** *** 354,363 **** } } - pthread_mutex_unlock(&x->x_mutex); } static void hidio_set_from_float(t_hidio *x, t_floatarg f) { - pthread_mutex_lock(&x->x_mutex); /* values greater than 1 set the polling delay time */ /* 1 and 0 for start/stop so you can use a [tgl] */ --- 351,358 ---- *************** *** 365,371 **** { x->x_delay = (t_int)f; - pthread_mutex_unlock(&x->x_mutex); hidio_poll(x,f); - pthread_mutex_lock(&x->x_mutex); } else if(f == 1) --- 360,364 ---- *************** *** 373,388 **** if(! x->x_started) { - pthread_mutex_unlock(&x->x_mutex); hidio_poll(x,f); - pthread_mutex_lock(&x->x_mutex); } } else if(f == 0) { ! pthread_mutex_unlock(&x->x_mutex); ! stop_poll(x); ! pthread_mutex_lock(&x->x_mutex); } - pthread_mutex_unlock(&x->x_mutex); } --- 366,376 ---- if(! x->x_started) { hidio_poll(x,f); } } else if(f == 0) { ! hidio_stop_poll(x); } } *************** *** 392,399 **** debug_print(LOG_DEBUG,"hidio_close"); ! pthread_mutex_lock(&x->x_mutex); ! x->x_requestcode = REQUEST_CLOSE; ! pthread_cond_signal(&x->x_requestcondition); ! pthread_mutex_unlock(&x->x_mutex); return (1); } --- 380,393 ---- debug_print(LOG_DEBUG,"hidio_close"); ! /* just to be safe, stop it first */ ! hidio_stop_poll(x); ! ! if(! hidio_close_device(x)) ! { ! debug_print(LOG_INFO,"[hidio] closed device %d",x->x_device_number); ! x->x_device_open = 0; ! return (0); ! } ! return (1); } *************** *** 410,433 **** static void hidio_open(t_hidio *x, t_symbol *s, int argc, t_atom *argv) { - short device_number; debug_print(LOG_DEBUG,"hid_%s",s->s_name); ! pthread_mutex_lock(&x->x_mutex); ! device_number = get_device_number_from_arguments(argc, argv); ! if (device_number > -1) { ! x->x_device_number = device_number; ! x->x_requestcode = REQUEST_OPEN; ! pthread_cond_signal(&x->x_requestcondition); } else debug_print(LOG_WARNING,"[hidio] device does not exist"); ! pthread_mutex_unlock(&x->x_mutex); } ! /* read from event queue, called from child thread, no mutex needed */ ! t_int hidio_child_read(t_hidio *x) { ! // debug_print(LOG_DEBUG,"hidio_child_read"); t_hid_element *current_element; unsigned int i; --- 404,449 ---- static void hidio_open(t_hidio *x, t_symbol *s, int argc, t_atom *argv) { debug_print(LOG_DEBUG,"hid_%s",s->s_name); + short new_device_number = get_device_number_from_arguments(argc, argv); + t_int started = x->x_started; // store state to restore after device is opened ! if (new_device_number > -1) { ! /* check whether we have to close previous device */ ! if (x->x_device_open && new_device_number != x->x_device_number) ! { ! hidio_close(x); ! } ! /* no device open, so open one now */ ! if (!x->x_device_open) ! { ! if(hidio_open_device(x, new_device_number)) ! { ! x->x_device_number = -1; ! error("[hidio] can not open device %d",new_device_number); ! } ! else ! { ! x->x_device_open = 1; ! x->x_device_number = new_device_number; ! /* restore the polling state so that when I [tgl] is used to ! * start/stop [hidio], the [tgl]'s state will continue to ! * accurately reflect [hidio]'s state */ ! if (started) ! hidio_set_from_float(x,x->x_delay); // TODO is this useful? ! debug_print(LOG_DEBUG,"[hidio] set device# to %d",new_device_number); ! output_device_number(x); ! } ! } } else debug_print(LOG_WARNING,"[hidio] device does not exist"); ! /* always output open result so you can test for success in Pd space */ ! output_open_status(x); } ! static void hidio_tick(t_hidio *x) { ! // debug_print(LOG_DEBUG,"hidio_tick"); t_hid_element *current_element; unsigned int i; *************** *** 438,442 **** clock_getftime(&right_now); #endif /* PD */ ! if(right_now > last_execute_time[x->x_device_number]) { --- 454,460 ---- clock_getftime(&right_now); #endif /* PD */ ! ! debug_print(LOG_DEBUG,"# %u\tnow: %u\tlast: %u", x->x_device_number, ! right_now, last_execute_time[x->x_device_number]); if(right_now > last_execute_time[x->x_device_number]) { *************** *** 456,494 **** } } - - // TODO: why is this 1? - return 1; - } - - static void *hidio_tick(t_hidio *x) - { - pthread_mutex_lock(&x->x_mutex); - if (x->x_requestcode == REQUEST_NOTHING) - { - x->x_requestcode = REQUEST_READ; - pthread_cond_signal(&x->x_requestcondition); - } if (x->x_started) { clock_delay(x->x_clock, x->x_delay); } - pthread_mutex_unlock(&x->x_mutex); - return NULL; - } - - static void hidio_print(t_hidio *x) - { - pthread_mutex_lock(&x->x_mutex); - x->x_requestcode = REQUEST_PRINT; - pthread_cond_signal(&x->x_requestcondition); - pthread_mutex_unlock(&x->x_mutex); } static void hidio_info(t_hidio *x) { ! pthread_mutex_lock(&x->x_mutex); ! x->x_requestcode = REQUEST_INFO; ! pthread_cond_signal(&x->x_requestcondition); ! pthread_mutex_unlock(&x->x_mutex); } --- 474,491 ---- } } if (x->x_started) { clock_delay(x->x_clock, x->x_delay); } } static void hidio_info(t_hidio *x) { ! output_open_status(x); ! output_device_number(x); ! output_device_count(x); ! output_poll_time(x); ! output_element_ranges(x); ! hidio_platform_specific_info(x); } *************** *** 500,504 **** } ! #ifndef PD static void hidio_int(t_hidio* x, long l) { --- 497,501 ---- } ! #ifndef PD /* Max */ static void hidio_int(t_hidio* x, long l) { *************** *** 511,693 **** static void hidio_debug(t_hidio *x, t_float f) { - pthread_mutex_lock(&x->x_mutex); global_debug_level = f; - pthread_mutex_unlock(&x->x_mutex); - } - - - /*------------------------------------------------------------------------------ - * child thread - */ - - static void *hidio_child(void *zz) - { - t_hidio *x = zz; - short device_number = -1; - - pthread_mutex_lock(&x->x_mutex); - while (1) - { - if (x->x_requestcode == REQUEST_NOTHING) - { - pthread_cond_signal(&x->x_answercondition); - pthread_cond_wait(&x->x_requestcondition, &x->x_mutex); - } - else if (x->x_requestcode == REQUEST_OPEN) - { - short new_device_number = x->x_device_number; - /* store running state to be restored after the device has been opened */ - t_int started = x->x_started; - int ret; - /* check whether we have to close previous device */ - if (x->x_device_open && device_number != x->x_device_number) - { - pthread_mutex_unlock(&x->x_mutex); - stop_poll(x); - ret = hidio_close_device(x); - pthread_mutex_lock(&x->x_mutex); - x->x_device_open = 0; - device_number = -1; - } - /* no device open, so open one now */ - if (!x->x_device_open) - { - pthread_mutex_unlock(&x->x_mutex); - ret = hidio_open_device(x, new_device_number); - pthread_mutex_lock(&x->x_mutex); - if (ret) - { - x->x_device_number = -1; - error("[hidio] can not open device %d",device_number); - } - else - { - x->x_device_open = 1; - device_number = x->x_device_number; /* keep local copy */ - pthread_mutex_unlock(&x->x_mutex); - /* restore the polling state so that when I [tgl] is used to start/stop [hidio], - * the [tgl]'s state will continue to accurately reflect [hidio]'s state */ - if (started) - hidio_set_from_float(x,x->x_delay); - debug_print(LOG_DEBUG,"[hidio] set device# to %d",device_number); - output_open_status(x); - output_device_number(x); - pthread_mutex_lock(&x->x_mutex); - } - } - if (x->x_requestcode == REQUEST_OPEN) - x->x_requestcode = REQUEST_NOTHING; - pthread_cond_signal(&x->x_answercondition); - } - else if (x->x_requestcode == REQUEST_READ) - { - pthread_mutex_unlock(&x->x_mutex); - hidio_child_read(x); - pthread_mutex_lock(&x->x_mutex); - if (x->x_requestcode == REQUEST_READ) - x->x_requestcode = REQUEST_NOTHING; - pthread_cond_signal(&x->x_answercondition); - } - else if (x->x_requestcode == REQUEST_SEND) - { - if (x->x_requestcode == REQUEST_SEND) - x->x_requestcode = REQUEST_NOTHING; - pthread_cond_signal(&x->x_answercondition); - } - else if (x->x_requestcode == REQUEST_PRINT) - { - pthread_mutex_unlock(&x->x_mutex); - hidio_doprint(x); - pthread_mutex_lock(&x->x_mutex); - if (x->x_requestcode == REQUEST_PRINT) - x->x_requestcode = REQUEST_NOTHING; - pthread_cond_signal(&x->x_answercondition); - } - else if (x->x_requestcode == REQUEST_INFO) - { - pthread_mutex_unlock(&x->x_mutex); - output_open_status(x); - output_device_number(x); - output_device_count(x); - output_poll_time(x); - output_element_ranges(x); - hidio_platform_specific_info(x); - pthread_mutex_lock(&x->x_mutex); - if (x->x_requestcode == REQUEST_INFO) - x->x_requestcode = REQUEST_NOTHING; - pthread_cond_signal(&x->x_answercondition); - } - else if (x->x_requestcode == REQUEST_CLOSE) - { - t_int ret; - pthread_mutex_unlock(&x->x_mutex); - stop_poll(x); - ret = hidio_close_device(x); - pthread_mutex_lock(&x->x_mutex); - if (!ret) - { - debug_print(LOG_INFO,"[hidio] closed device %d",x->x_device_number); - x->x_device_open = 0; - } - if (x->x_requestcode == REQUEST_CLOSE) - x->x_requestcode = REQUEST_NOTHING; - pthread_cond_signal(&x->x_answercondition); - } - else if (x->x_requestcode == REQUEST_QUIT) - { - pthread_mutex_unlock(&x->x_mutex); - stop_poll(x); - hidio_close_device(x); - pthread_mutex_lock(&x->x_mutex); - x->x_requestcode = REQUEST_NOTHING; - pthread_cond_signal(&x->x_answercondition); - break; /* leave the while loop */ - } - else - { - ; /* nothing: shouldn't get here anyway */ - } - } - pthread_mutex_unlock(&x->x_mutex); - return (0); - } - - /* change priority of child thread */ - #ifdef PD - static void hidio_priority(t_hidio *x, t_floatarg p) - #else - static void hidio_priority(t_hidio *x, long p) - #endif - { - pthread_mutex_lock(&x->x_mutex); - p = 2 * (CLIP(p, 0, 10) - 5); - if (x->x_thread) - { - struct sched_param parm; - int policy; - if (pthread_getschedparam(x->x_thread, &policy, &parm) < 0) - { - post("hidio: warning: failed to get thread priority"); - } - else - { - parm.sched_priority = x->x_priority + (int)p; /* adjust priority */ - - if (parm.sched_priority < sched_get_priority_min(policy)) - { - parm.sched_priority = sched_get_priority_min(policy); - } - else if (parm.sched_priority > sched_get_priority_max(policy)) - { - parm.sched_priority = sched_get_priority_max(policy); - } - - if (pthread_setschedparam(x->x_thread, policy, &parm) < 0) - { - post("hidio: warning: failed to change thread priority to %d", parm.sched_priority); - } - } - } - pthread_mutex_unlock(&x->x_mutex); } --- 508,512 ---- *************** *** 698,737 **** static void hidio_free(t_hidio* x) { - void *threadrtn; - debug_print(LOG_DEBUG,"hidio_free"); - - /* stop polling for input */ - if (x->x_clock) - clock_unset(x->x_clock); - - pthread_mutex_lock(&x->x_mutex); - /* request QUIT and wait for acknowledge */ - x->x_requestcode = REQUEST_QUIT; - if (x->x_thread) - { - post("hidio: stopping worker thread. . ."); - pthread_cond_signal(&x->x_requestcondition); - while (x->x_requestcode != REQUEST_NOTHING) - { - post("hidio: ...signalling..."); - pthread_cond_signal(&x->x_requestcondition); - pthread_cond_wait(&x->x_answercondition, &x->x_mutex); - } - pthread_mutex_unlock(&x->x_mutex); - if (pthread_join(x->x_thread, &threadrtn)) - error("hidio_free: join failed"); - post("hidio: ...done"); - } - else pthread_mutex_unlock(&x->x_mutex); clock_free(x->x_clock); hidio_instance_count--; hidio_platform_specific_free(x); - - pthread_cond_destroy(&x->x_requestcondition); - pthread_cond_destroy(&x->x_answercondition); - pthread_mutex_destroy(&x->x_mutex); } --- 517,527 ---- static void hidio_free(t_hidio* x) { debug_print(LOG_DEBUG,"hidio_free"); + hidio_close(x); clock_free(x->x_clock); hidio_instance_count--; hidio_platform_specific_free(x); } *************** *** 769,776 **** #endif /* _WIN32 */ - pthread_mutex_init(&x->x_mutex, 0); - pthread_cond_init(&x->x_requestcondition, 0); - pthread_cond_init(&x->x_answercondition, 0); - x->x_device_number = get_device_number_from_arguments(argc, argv); --- 559,562 ---- *************** *** 778,784 **** hidio_instance_count++; - x->x_requestcode = REQUEST_NOTHING; - pthread_create(&x->x_thread, 0, hidio_child, x); - return (x); } --- 564,567 ---- *************** *** 821,827 **** class_addmethod(hidio_class,(t_method) hidio_ff_print,gensym("ff_print"),0); - class_addmethod(hidio_class,(t_method) hidio_priority, gensym("priority"), A_FLOAT, A_NULL); - - post("[hidio] %d.%d, written by Hans-Christoph Steiner <hans(a)eds.org>", HIDIO_MAJOR_VERSION, HIDIO_MINOR_VERSION); --- 604,607 ---- *************** *** 915,919 **** class_addmethod(c, (method)hidio_ff_print, "ff_print",0); /* perfomrance / system stuff */ - class_addmethod(c, (method)hidio_priority, "priority", A_LONG,0); class_addmethod(c, (method)hidio_assist, "assist", A_CANT, 0); --- 695,698 ---- Index: hidio_darwin.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio_darwin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** hidio_darwin.c 8 Dec 2006 11:28:25 -0000 1.4 --- hidio_darwin.c 31 Dec 2006 22:49:16 -0000 1.5 *************** *** 3,8 **** * Apple Darwin HID Manager support for Pd [hidio] object * - * some code from SuperCollider3's SC_HID.cpp by Jan Truetzschler Falkenstein - * * Copyright (c) 2004 Hans-Christoph All rights reserved. * --- 3,6 ---- *************** *** 48,59 **** #include <IOKit/hid/IOHIDUsageTables.h> #include <ForceFeedback/ForceFeedback.h> #include <mach/mach.h> #include <mach/mach_error.h> #include "hidio.h" ! #define DEBUG(x) ! //#define DEBUG(x) x /*============================================================================== --- 46,59 ---- #include <IOKit/hid/IOHIDUsageTables.h> #include <ForceFeedback/ForceFeedback.h> + #include <CoreServices/CoreServices.h> #include <mach/mach.h> + #include <mach/mach_time.h> #include <mach/mach_error.h> #include "hidio.h" ! //#define DEBUG(x) ! #define DEBUG(x) x /*============================================================================== *************** *** 61,69 **** *======================================================================== */ - extern t_int hidio_instance_count; // in hidio.h - /* store device pointers so I don't have to query them all the time */ pRecDevice device_pointer[MAX_DEVICES]; // this stuff is moving to the t_hid_element struct --- 61,72 ---- *======================================================================== */ /* store device pointers so I don't have to query them all the time */ pRecDevice device_pointer[MAX_DEVICES]; + // temp hack for measuring latency + #define LATENCY_MAX 8192 + int latency[LATENCY_MAX]; + int latency_i; + int latency_average; // this stuff is moving to the t_hid_element struct *************** *** 137,141 **** case kHIDUsage_GD_Wheel: convert_axis_to_symbols(pCurrentHIDElement, new_element, 8); break; case kHIDUsage_GD_Hatswitch: ! // this is still a mystery how to handle new_element->type = ps_absolute; new_element->name = absolute_symbols[9]; /* hatswitch */ --- 140,144 ---- case kHIDUsage_GD_Wheel: convert_axis_to_symbols(pCurrentHIDElement, new_element, 8); break; case kHIDUsage_GD_Hatswitch: ! // TODO: this is still a mystery how to handle, due to USB HID vs. Linux input.h new_element->type = ps_absolute; new_element->name = absolute_symbols[9]; /* hatswitch */ *************** *** 279,282 **** --- 282,304 ---- /* ============================================================================== */ + double calculate_event_latency( uint64_t endTime, uint64_t startTime ) + { + uint64_t difference = endTime - startTime; + static double conversion = 0.0; + + if( 0.0 == conversion ) + { + mach_timebase_info_data_t info; + kern_return_t err = mach_timebase_info( &info ); + if( 0 == err ) + { + //convert to seconds (multiply by 1e-6 to get miliseconds) + conversion = 1e-6 * (double) info.numer / (double) info.denom; + } + } + return conversion * (double) difference; + } + + short get_device_number_by_id(unsigned short vendor_id, unsigned short product_id) { *************** *** 381,384 **** --- 403,411 ---- pCurrentHIDElement = HIDGetFirstDeviceElement( pCurrentHIDDevice, kHIDElementTypeInput ); + + /* TODO: axes should be the first elements in the array since they + * produce many more events than buttons. This will save loop cycles + * in the read statement, since it had to cycle thru the elements to + * find a match. */ while( pCurrentHIDElement != NULL) { *************** *** 397,427 **** element[x->x_device_number]); ! if( (pCurrentHIDElement->usagePage == kHIDPage_GenericDesktop) && ! (!pCurrentHIDElement->relative) ) { ! switch(pCurrentHIDElement->usage) { ! case kHIDUsage_GD_X: ! case kHIDUsage_GD_Y: ! case kHIDUsage_GD_Z: ! case kHIDUsage_GD_Rx: ! case kHIDUsage_GD_Ry: ! case kHIDUsage_GD_Rz: ! case kHIDUsage_GD_Slider: ! case kHIDUsage_GD_Dial: ! case kHIDUsage_GD_Wheel: ! //case kHIDUsage_GD_Hatswitch: // hatswitches are more like buttons, so queue them ! debug_print(LOG_INFO,"[hidio] storing absolute axis to poll %s, %s (0x%04x 0x%04x)", ! type_name, usage_name, pCurrentHIDElement->usagePage, pCurrentHIDElement->usage); - if(HIDDequeueElement(pCurrentHIDDevice,pCurrentHIDElement) != kIOReturnSuccess) - debug_print(LOG_ERR,"[hidio] could not dequeue element"); - new_element->polled = 1; - break; } } ! else { ! debug_print(LOG_INFO,"[hidio] queuing element %s, %s (0x%04x 0x%04x)", type_name, usage_name, pCurrentHIDElement->usagePage, pCurrentHIDElement->usage); --- 424,461 ---- element[x->x_device_number]); ! if(!pCurrentHIDElement->relative) /* relative elements should remain queued */ { ! switch( pCurrentHIDElement->usagePage) { ! case kHIDPage_GenericDesktop: ! switch(pCurrentHIDElement->usage) ! { ! case kHIDUsage_GD_X: ! case kHIDUsage_GD_Y: ! case kHIDUsage_GD_Z: ! case kHIDUsage_GD_Rx: ! case kHIDUsage_GD_Ry: ! case kHIDUsage_GD_Rz: ! case kHIDUsage_GD_Slider: ! case kHIDUsage_GD_Dial: ! case kHIDUsage_GD_Wheel: ! //case kHIDUsage_GD_Hatswitch: // hatswitches are more like buttons, so queue them ! debug_print(LOG_INFO,"[hidio] storing absolute axis to poll %s, %s (0x%04x 0x%04x)", ! type_name, usage_name, ! pCurrentHIDElement->usagePage, pCurrentHIDElement->usage); ! if(HIDDequeueElement(pCurrentHIDDevice,pCurrentHIDElement) != kIOReturnSuccess) ! debug_print(LOG_ERR,"[hidio] could not dequeue element"); ! new_element->polled = 1; ! break; ! } ! default: ! debug_print(LOG_INFO,"\tqueuing element %s, %s (0x%04x 0x%04x)", ! type_name, usage_name, pCurrentHIDElement->usagePage, pCurrentHIDElement->usage); } } ! else { ! debug_print(LOG_INFO,"\tqueuing element %s, %s (0x%04x 0x%04x)", type_name, usage_name, pCurrentHIDElement->usagePage, pCurrentHIDElement->usage); *************** *** 609,621 **** void hidio_get_events(t_hidio *x) { ! unsigned int i; ! pRecDevice pCurrentHIDDevice; ! t_hid_element *current_element; ! IOHIDEventStruct event; pCurrentHIDDevice = device_pointer[x->x_device_number]; /* get the queued events first and store them */ ! // while( (HIDGetEvent(pCurrentHIDDevice, (void*) &event)) && (event_counter < MAX_EVENTS_PER_POLL) ) while(HIDGetEvent(pCurrentHIDDevice, (void*) &event)) { --- 643,656 ---- void hidio_get_events(t_hidio *x) { ! unsigned int i,j; ! pRecDevice pCurrentHIDDevice; ! t_hid_element *current_element; ! IOHIDEventStruct event; ! uint64_t timestamp, now, difference; pCurrentHIDDevice = device_pointer[x->x_device_number]; /* get the queued events first and store them */ ! // TODO: while( (HIDGetEvent(pCurrentHIDDevice, (void*) &event)) && (event_counter < MAX_EVENTS_PER_POLL) ) while(HIDGetEvent(pCurrentHIDDevice, (void*) &event)) { *************** *** 629,635 **** current_element->value = event.value; ! debug_print(LOG_DEBUG,"output this: %s %s %d prev %d",current_element->type->s_name, ! current_element->name->s_name, current_element->value, ! current_element->previous_value); } /* absolute axes don't need to be queued, they can just be polled */ --- 664,696 ---- current_element->value = event.value; ! // debug_print(LOG_DEBUG,"output this: %s %s %d prev %d",current_element->type->s_name, ! // current_element->name->s_name, current_element->value, ! // current_element->previous_value); ! // debug_print(LOG_DEBUG,"timestamp: %u %u", event.timestamp.hi, event.timestamp.lo); ! timestamp = * (uint64_t *) &(event.timestamp); ! now = mach_absolute_time(); ! difference = calculate_event_latency(now, timestamp); ! // temp hack to measure latency ! if( latency_i < LATENCY_MAX) ! { ! latency[latency_i] = (int) difference; ! if( latency[latency_i] < 100 ) ! latency_average += latency[latency_i]; ! ++latency_i; ! } ! else ! { ! /* for(j=0;j<LATENCY_MAX;++j) ! { ! fprintf(stderr,"%d ",latency[j]); ! }*/ ! latency_average = latency_average / LATENCY_MAX; ! fprintf(stderr,"average: %d\n",latency_average); ! latency_i = 0; ! latency_average = 0; ! } ! // debug_print(LOG_DEBUG,"\t\t\t\t\ttimestamp: %llu",timestamp); ! // debug_print(LOG_DEBUG,"\t\t\t\t\tdifference: %llu", difference); ! // post("%d %llu", i, difference); } /* absolute axes don't need to be queued, they can just be polled */ *************** *** 646,650 **** } ! t_int hidio_open_device(t_hidio *x, short device_number) { --- 707,711 ---- } ! // TODO: return the same as POSIX open()/close() - 0=success, -1=fail t_int hidio_open_device(t_hidio *x, short device_number) { *************** *** 657,660 **** --- 718,723 ---- FFDeviceObjectReference ffDeviceReference = NULL; + latency_i = 0;latency_average = 0; // temp hack, to be removed + /* rebuild device list to make sure the list is current */ if( !HIDHaveDeviceList() ) hidio_build_device_list(); *************** *** 695,699 **** } ! t_int hidio_close_device(t_hidio *x) { --- 758,762 ---- } ! // TODO: return the same as POSIX open()/close() - 0=success, -1=fail t_int hidio_close_device(t_hidio *x) { *************** *** 739,743 **** /* TODO: this should be dumped for [devices( and [elements( messages */ ! void hidio_doprint(t_hidio *x) { if( !HIDHaveDeviceList() ) hidio_build_device_list(); --- 802,806 ---- /* TODO: this should be dumped for [devices( and [elements( messages */ ! void hidio_print(t_hidio *x) { if( !HIDHaveDeviceList() ) hidio_build_device_list(); *************** *** 753,756 **** --- 816,820 ---- void hidio_platform_specific_free(t_hidio *x) { + int j; debug_print(LOG_DEBUG,"hidio_platform_specific_free"); /* only call this if the last instance is being freed */ *************** *** 761,764 **** --- 825,832 ---- HIDReleaseDeviceList(); } + for(j=0;j<LATENCY_MAX;++j) + { + fprintf(stderr,"%d ",latency[j]); + } } Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 8 Dec 2006 06:33:26 -0000 1.2 --- Makefile 31 Dec 2006 22:49:16 -0000 1.3 *************** *** 16,20 **** # for emacs etags: ! etags ../../../pd/src/*.h *.[ch] linux/input.h make etags_`uname -s` --- 16,21 ---- # for emacs etags: ! etags ../../../pd/src/*.h *.[ch] linux/input.h /usr/include/stdlib.h \ ! /usr/include/time.h /usr/include/stdio.h make etags_`uname -s` *************** *** 23,27 **** /System/Library/Frameworks/ForceFeedback.framework/Headers/*.h \ /System/Library/Frameworks/Carbon.framework/Headers/*.h \ ! /System/Library/Frameworks/IOKit.framework/Headers/hid*/*.[ch] etags_Linux: --- 24,31 ---- /System/Library/Frameworks/ForceFeedback.framework/Headers/*.h \ /System/Library/Frameworks/Carbon.framework/Headers/*.h \ ! /System/Library/Frameworks/CoreServices.framework/Headers/*.h \ ! /System/Library/Frameworks/IOKit.framework/Headers/*.[ch] \ ! /System/Library/Frameworks/IOKit.framework/Headers/hid*/*.[ch] \ ! /usr/include/mach/*.h etags_Linux: Index: hidio_linux.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio_linux.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hidio_linux.c 8 Dec 2006 06:33:26 -0000 1.2 --- hidio_linux.c 31 Dec 2006 22:49:16 -0000 1.3 *************** *** 435,439 **** } ! t_int hidio_open_device(t_hidio *x, short device_number) { --- 435,439 ---- } ! // TODO: return the same as POSIX open()/close() - 0=success, -1=fail t_int hidio_open_device(t_hidio *x, short device_number) { *************** *** 478,484 **** } ! /* ! * Under GNU/Linux, the device is a filehandle ! */ t_int hidio_close_device(t_hidio *x) { --- 478,483 ---- } ! /* Under GNU/Linux, the device is a filehandle */ ! // TODO: return the same as POSIX open()/close() - 0=success, -1=fail t_int hidio_close_device(t_hidio *x) { Index: hidio-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio-help.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** hidio-help.pd 8 Dec 2006 06:33:26 -0000 1.3 --- hidio-help.pd 31 Dec 2006 22:49:16 -0000 1.4 *************** *** 1,3 **** ! #N canvas 157 38 862 587 10; #X floatatom 27 445 5 0 0 0 - - -; #X floatatom 83 445 5 0 0 0 - - -; --- 1,3 ---- ! #N canvas 157 38 878 603 10; #X floatatom 27 445 5 0 0 0 - - -; #X floatatom 83 445 5 0 0 0 - - -; *************** *** 271,275 **** #X obj 459 508 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X msg 25 155 debug 0; #X msg 298 145 info; #N canvas 743 25 411 235 see 0; --- 271,275 ---- #X obj 459 508 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X msg 25 155 debug 9; #X msg 298 145 info; #N canvas 743 25 411 235 see 0; *************** *** 399,406 **** ; #N canvas 162 133 570 420 serin 0; ! #X obj 209 61 cnv 15 15 15 empty \$0-debug-canvas 0 4 8 0 14 -233017 -1 0; #X obj 60 61 hradio 15 1 1 10 empty empty empty 0 -6 0 8 -261689 -1 ! -1 0; #X obj 60 13 inlet; #X msg 200 202 label \$1; --- 399,406 ---- ; #N canvas 162 133 570 420 serin 0; ! #X obj 209 61 cnv 15 15 15 empty \$0-debug-canvas 9 4 8 0 14 -233017 -1 0; #X obj 60 61 hradio 15 1 1 10 empty empty empty 0 -6 0 8 -261689 -1 ! -1 9; #X obj 60 13 inlet; #X msg 200 202 label \$1; *************** *** 479,483 **** #X obj 9 466 route a_key b_key c_key d_key e_key f_key g_key h_key i_key j_key k_key l_key m_key n_key o_key p_key; ! #N canvas 114 93 471 350 raw 0; #X obj 144 45 inlet; #X obj 88 104 route DESKTOP; --- 479,483 ---- #X obj 9 466 route a_key b_key c_key d_key e_key f_key g_key h_key i_key j_key k_key l_key m_key n_key o_key p_key; ! #N canvas 114 93 475 354 raw 0; #X obj 144 45 inlet; #X obj 88 104 route DESKTOP; *************** *** 494,497 **** --- 494,498 ---- #X obj 333 99 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; + #X obj 354 45 inlet; #X connect 0 0 1 0; #X connect 0 0 8 0; *************** *** 504,509 **** --- 505,513 ---- #X connect 8 0 9 0; #X connect 10 0 8 1; + #X connect 11 0 10 0; #X restore 408 294 pd raw; #X floatatom 63 401 6 0 0 0 - - -; + #X obj 455 295 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 + 1; #X connect 2 0 65 0; #X connect 8 0 65 0; *************** *** 561,562 **** --- 565,567 ---- #X connect 74 14 51 0; #X connect 74 15 52 0; + #X connect 77 0 75 1; Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TODO 30 Nov 2006 05:53:40 -0000 1.1 --- TODO 31 Dec 2006 22:49:16 -0000 1.2 *************** *** 53,60 **** = make only the first executed instance fetch the data ! the function is ugen_getsortno() -- returns ! an integer which increases eachtime DSP is restarted. You can add the ! function call (to the ugen chain for instance) each time you see ! ugen_getsortno() return an integer greater than the previous one you've ______________________________________________________________________________ --- 53,62 ---- = make only the first executed instance fetch the data ! - double right_now = clock_getlogicaltime(); ! this only works when instances are in the same patch, not when instances are ! in different patches ! ! - implement event output data structure ! ______________________________________________________________________________

1 0

packages/darwin_app org.puredata.pd.plist,1.20,1.21
by Hans-Christoph Steiner 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12836/darwin_app Modified Files: org.puredata.pd.plist Log Message: added libdir to the default library list Index: org.puredata.pd.plist =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/org.puredata.pd.plist,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** org.puredata.pd.plist 17 Oct 2006 18:02:41 -0000 1.20 --- org.puredata.pd.plist 31 Dec 2006 20:05:10 -0000 1.21 *************** *** 8,73 **** <string></string> <key>loadlib1</key> ! <string>Gem</string> <key>loadlib2</key> ! <string>cyclone</string> <key>loadlib3</key> ! <string>zexy</string> <key>loadlib4</key> ! <string>creb</string> <key>loadlib5</key> ! <string>cxc</string> <key>loadlib6</key> ! <string>iemlib</string> <key>loadlib7</key> ! <string>list-abs</string> <key>loadlib8</key> ! <string>mapping</string> <key>loadlib9</key> ! <string>markex</string> <key>loadlib10</key> ! <string>maxlib</string> <key>loadlib11</key> ! <string>memento</string> <key>loadlib12</key> ! <string>mjlib</string> <key>loadlib13</key> ! <string>motex</string> <key>loadlib14</key> ! <string>oscx</string> <key>loadlib15</key> ! <string>pddp</string> <key>loadlib16</key> ! <string>pdogg</string> <key>loadlib17</key> ! <string>pixeltango</string> <key>loadlib18</key> ! <string>pmpd</string> <key>loadlib19</key> ! <string>rradical</string> <key>loadlib20</key> ! <string>sigpack</string> <key>loadlib21</key> ! <string>smlib</string> <key>loadlib22</key> ! <string>toxy</string> <key>loadlib23</key> ! <string>unauthorized</string> <key>loadlib24</key> ! <string>vbap</string> <key>loadlib25</key> ! <string>pan</string> <key>loadlib26</key> ! <string>freeverb</string> <key>loadlib27</key> ! <string>hcs</string> <key>loadlib28</key> ! <string>jmmmp</string> <key>loadlib29</key> ! <string>ext13</string> <key>loadlib30</key> ! <string>hardware</string> <key>loadlib31</key> ! <string>deprecated</string> <key>loadlib32</key> <string>flatspace</string> <key>path1</key> --- 8,75 ---- <string></string> <key>loadlib1</key> ! <string>libdir</string> <key>loadlib2</key> ! <string>Gem</string> <key>loadlib3</key> ! <string>cyclone</string> <key>loadlib4</key> ! <string>zexy</string> <key>loadlib5</key> ! <string>creb</string> <key>loadlib6</key> ! <string>cxc</string> <key>loadlib7</key> ! <string>iemlib</string> <key>loadlib8</key> ! <string>list-abs</string> <key>loadlib9</key> ! <string>mapping</string> <key>loadlib10</key> ! <string>markex</string> <key>loadlib11</key> ! <string>maxlib</string> <key>loadlib12</key> ! <string>memento</string> <key>loadlib13</key> ! <string>mjlib</string> <key>loadlib14</key> ! <string>motex</string> <key>loadlib15</key> ! <string>oscx</string> <key>loadlib16</key> ! <string>pddp</string> <key>loadlib17</key> ! <string>pdogg</string> <key>loadlib18</key> ! <string>pixeltango</string> <key>loadlib19</key> ! <string>pmpd</string> <key>loadlib20</key> ! <string>rradical</string> <key>loadlib21</key> ! <string>sigpack</string> <key>loadlib22</key> ! <string>smlib</string> <key>loadlib23</key> ! <string>toxy</string> <key>loadlib24</key> ! <string>unauthorized</string> <key>loadlib25</key> ! <string>vbap</string> <key>loadlib26</key> ! <string>pan</string> <key>loadlib27</key> ! <string>freeverb</string> <key>loadlib28</key> ! <string>hcs</string> <key>loadlib29</key> ! <string>jmmmp</string> <key>loadlib30</key> ! <string>ext13</string> <key>loadlib31</key> ! <string>hardware</string> <key>loadlib32</key> + <string>deprecated</string> + <key>loadlib33</key> <string>flatspace</string> <key>path1</key>

1 0

packages/linux_make .pdsettings,1.8,1.9
by Hans-Christoph Steiner 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/packages/linux_make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12836/linux_make Modified Files: .pdsettings Log Message: added libdir to the default library list Index: .pdsettings =================================================================== RCS file: /cvsroot/pure-data/packages/linux_make/.pdsettings,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** .pdsettings 17 Oct 2006 18:02:41 -0000 1.8 --- .pdsettings 31 Dec 2006 20:05:10 -0000 1.9 *************** *** 1,39 **** standardpath: 1 verbose: 0 ! loadlib1: Gem ! loadlib2: cyclone ! loadlib3: zexy ! loadlib4: creb ! loadlib5: cxc ! loadlib6: iemlib ! loadlib7: list-abs ! loadlib8: mapping ! loadlib9: markex ! loadlib10: maxlib ! loadlib11: memento ! loadlib12: mjlib ! loadlib13: motex ! loadlib14: oscx ! loadlib15: pddp ! loadlib16: pdogg ! loadlib17: pixeltango ! loadlib18: pmpd ! loadlib19: rradical ! loadlib20: sigpack ! loadlib21: smlib ! loadlib22: toxy ! loadlib23: unauthorized ! loadlib24: vbap ! loadlib25: pan ! loadlib26: freeverb ! loadlib27: hcs ! loadlib28: jmmmp ! loadlib29: ext13 ! loadlib30: hardware ! loadlib31: deprecated ! loadlib32: flatspace path1: /usr/X11R6/lib/X11/fonts path2: /usr/X11R6/lib/X11/fonts/TTF path3: /usr/lib/X11/fonts path4: /usr/share/fonts/truetype ! nloadlib: 32 --- 1,40 ---- standardpath: 1 verbose: 0 ! loadlib1: libdir ! loadlib2: Gem ! loadlib3: cyclone ! loadlib4: zexy ! loadlib5: creb ! loadlib6: cxc ! loadlib7: iemlib ! loadlib8: list-abs ! loadlib9: mapping ! loadlib10: markex ! loadlib11: maxlib ! loadlib12: memento ! loadlib13: mjlib ! loadlib14: motex ! loadlib15: oscx ! loadlib16: pddp ! loadlib17: pdogg ! loadlib18: pixeltango ! loadlib19: pmpd ! loadlib20: rradical ! loadlib21: sigpack ! loadlib22: smlib ! loadlib23: toxy ! loadlib24: unauthorized ! loadlib25: vbap ! loadlib26: pan ! loadlib27: freeverb ! loadlib28: hcs ! loadlib29: jmmmp ! loadlib30: ext13 ! loadlib31: hardware ! loadlib32: deprecated ! loadlib33: flatspace path1: /usr/X11R6/lib/X11/fonts path2: /usr/X11R6/lib/X11/fonts/TTF path3: /usr/lib/X11/fonts path4: /usr/share/fonts/truetype ! nloadlib: 33

1 0

packages/win32_inno pd-settings.reg,1.19,1.20
by Hans-Christoph Steiner 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/packages/win32_inno In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12836/win32_inno Modified Files: pd-settings.reg Log Message: added libdir to the default library list Index: pd-settings.reg =================================================================== RCS file: /cvsroot/pure-data/packages/win32_inno/pd-settings.reg,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pd-settings.reg 17 Oct 2006 18:02:41 -0000 1.19 --- pd-settings.reg 31 Dec 2006 20:05:10 -0000 1.20 *************** *** 2,39 **** [HKEY_LOCAL_MACHINE\SOFTWARE\Pd] ! "loadlib1"="Gem" ! "loadlib2"="cyclone" ! "loadlib3"="zexy" ! "loadlib4"="creb" ! "loadlib5"="cxc" ! "loadlib6"="iemlib" ! "loadlib7"="list-abs" ! "loadlib8"="mapping" ! "loadlib9"="markex" ! "loadlib10"="maxlib" ! "loadlib11"="memento" ! "loadlib12"="mjlib" ! "loadlib13"="motex" ! "loadlib14"="oscx" ! "loadlib15"="pddp" ! "loadlib16"="pdogg" ! "loadlib17"="pixeltango" ! "loadlib18"="pmpd" ! "loadlib19"="rradical" ! "loadlib20"="sigpack" ! "loadlib21"="smlib" ! "loadlib22"="toxy" ! "loadlib23"="unauthorized" ! "loadlib24"="vbap" ! "loadlib25"="pan" ! "loadlib26"="freeverb" ! "loadlib27"="hcs" ! "loadlib28"="jmmmp" ! "loadlib29"="ext13" ! "loadlib30"="hardware" ! "loadlib31"="deprecated" ! "loadlib32"="flatspace" ; delete any previous loadlib flags - "loadlib33"=- "loadlib34"=- "loadlib35"=- --- 2,39 ---- [HKEY_LOCAL_MACHINE\SOFTWARE\Pd] ! "loadlib1"="libdir" ! "loadlib2"="Gem" ! "loadlib3"="cyclone" ! "loadlib4"="zexy" ! "loadlib5"="creb" ! "loadlib6"="cxc" ! "loadlib7"="iemlib" ! "loadlib8"="list-abs" ! "loadlib9"="mapping" ! "loadlib10"="markex" ! "loadlib11"="maxlib" ! "loadlib12"="memento" ! "loadlib13"="mjlib" ! "loadlib14"="motex" ! "loadlib15"="oscx" ! "loadlib16"="pddp" ! "loadlib17"="pdogg" ! "loadlib18"="pixeltango" ! "loadlib19"="pmpd" ! "loadlib20"="rradical" ! "loadlib21"="sigpack" ! "loadlib22"="smlib" ! "loadlib23"="toxy" ! "loadlib24"="unauthorized" ! "loadlib25"="vbap" ! "loadlib26"="pan" ! "loadlib27"="freeverb" ! "loadlib28"="hcs" ! "loadlib29"="jmmmp" ! "loadlib30"="ext13" ! "loadlib31"="hardware" ! "loadlib32"="deprecated" ! "loadlib33"="flatspace" ; delete any previous loadlib flags "loadlib34"=- "loadlib35"=-

1 0

pd/src desire.h, 1.1.2.49.2.20, 1.1.2.49.2.21 desire.c, 1.1.2.217.2.99, 1.1.2.217.2.100 kernel.c, 1.1.2.19, 1.1.2.20 m_pd.h, 1.4.4.11.2.33.2.20, 1.4.4.11.2.33.2.21
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28764 Modified Files: Tag: desiredata desire.h desire.c kernel.c m_pd.h Log Message: gradual evaluation Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.20 retrieving revision 1.4.4.11.2.33.2.21 diff -C2 -d -r1.4.4.11.2.33.2.20 -r1.4.4.11.2.33.2.21 *** m_pd.h 31 Dec 2006 05:37:54 -0000 1.4.4.11.2.33.2.20 --- m_pd.h 31 Dec 2006 19:21:40 -0000 1.4.4.11.2.33.2.21 *************** *** 344,351 **** EXTERN t_atom *binbuf_getvec(t_binbuf *x); EXTERN void binbuf_eval(t_binbuf *x, t_pd *target, int argc, t_atom *argv); ! EXTERN int binbuf_read( t_binbuf *b, char *filename, char *dirname, int crflag); ! EXTERN int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int crflag); ! EXTERN int binbuf_read_via_path( t_binbuf *b, char *filename, char *dirname, int crflag); ! EXTERN int binbuf_write( t_binbuf *x, char *filename, char *dir, int crflag); EXTERN void binbuf_evalfile(t_symbol *name, t_symbol *dir); EXTERN t_symbol *binbuf_realizedollsym(t_symbol *s, int ac, t_atom *av, int tonew); --- 344,351 ---- EXTERN t_atom *binbuf_getvec(t_binbuf *x); EXTERN void binbuf_eval(t_binbuf *x, t_pd *target, int argc, t_atom *argv); ! EXTERN int binbuf_read( t_binbuf *b, char *filename, char *dirname, int flags); ! EXTERN int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int flags); ! EXTERN int binbuf_read_via_path( t_binbuf *b, char *filename, char *dirname, int flags); ! EXTERN int binbuf_write( t_binbuf *x, char *filename, char *dir, int flags); EXTERN void binbuf_evalfile(t_symbol *name, t_symbol *dir); EXTERN t_symbol *binbuf_realizedollsym(t_symbol *s, int ac, t_atom *av, int tonew); Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -C2 -d -r1.1.2.19 -r1.1.2.20 *** kernel.c 31 Dec 2006 16:39:17 -0000 1.1.2.19 --- kernel.c 31 Dec 2006 19:21:40 -0000 1.1.2.20 *************** *** 1860,1870 **** } ! void pd_eval_text(char *t) { t_binbuf *x = binbuf_new(); ! char *end = t + strlen(t); while (t!=end) { t = sys_syntax ? binbuf_text_matju(x,t,end) : binbuf_text_miller(x,t,end); if (x->n && x->vec[x->n-1].a_type == A_SEMI) { - fprintf(stderr,"pd_eval_text semi n=%d\n",x->n); binbuf_eval(x,0,0,0); binbuf_clear(x); --- 1860,1869 ---- } ! void pd_eval_text(char *t, size_t size) { t_binbuf *x = binbuf_new(); ! char *end = t+size; while (t!=end) { t = sys_syntax ? binbuf_text_matju(x,t,end) : binbuf_text_miller(x,t,end); if (x->n && x->vec[x->n-1].a_type == A_SEMI) { binbuf_eval(x,0,0,0); binbuf_clear(x); *************** *** 2266,2270 **** } ! int binbuf_read(t_binbuf *b, char *filename, char *dirname, int crflag) { long length; char *buf; --- 2265,2269 ---- } ! int binbuf_read(t_binbuf *b, char *filename, char *dirname, int flags) { long length; char *buf; *************** *** 2287,2292 **** return 1; } ! if (crflag) for (int i=0; i<length; i++) if (buf[i]=='\n') buf[i] = ';'; ! binbuf_text(b, buf, length); t_freebytes(buf, length); close(fd); --- 2286,2291 ---- return 1; } ! if (flags&1) for (int i=0; i<length; i++) if (buf[i]=='\n') buf[i] = ';'; ! if (flags&2) pd_eval_text(buf,length); else binbuf_text(b, buf, length); t_freebytes(buf, length); close(fd); *************** *** 2295,2313 **** /* read a binbuf from a file, via the search patch of a canvas */ ! int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int crflag) { char buf[MAXPDSTRING], *bufptr; int filedesc = canvas_open(canvas, filename, "", buf, &bufptr, MAXPDSTRING, 0); if (filedesc<0) {error("%s: can't open", filename); return 1;} close(filedesc); ! return !!binbuf_read(b, bufptr, buf, crflag); } /* old version */ ! int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, int crflag) { char buf[MAXPDSTRING], *bufptr; int filedesc = open_via_path(dirname, filename, "", buf, &bufptr, MAXPDSTRING, 0); if (filedesc<0) {error("%s: can't open", filename); return 1;} close(filedesc); ! return !!binbuf_read(b, bufptr, buf, crflag); } --- 2294,2312 ---- /* read a binbuf from a file, via the search patch of a canvas */ ! int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int flags) { char buf[MAXPDSTRING], *bufptr; int filedesc = canvas_open(canvas, filename, "", buf, &bufptr, MAXPDSTRING, 0); if (filedesc<0) {error("%s: can't open", filename); return 1;} close(filedesc); ! return !!binbuf_read(b, bufptr, buf, flags); } /* old version */ ! int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, int flags) { char buf[MAXPDSTRING], *bufptr; int filedesc = open_via_path(dirname, filename, "", buf, &bufptr, MAXPDSTRING, 0); if (filedesc<0) {error("%s: can't open", filename); return 1;} close(filedesc); ! return !!binbuf_read(b, bufptr, buf, flags); } *************** *** 2608,2615 **** void pd_doloadbang(void); - /* LATER make this evaluate the file on-the-fly. */ /* LATER figure out how to log errors */ ! void binbuf_evalfile(t_symbol *name, t_symbol *dir) ! { t_binbuf *b = binbuf_new(); int import = !strcmp(name->s_name + strlen(name->s_name) - 4, ".pat"); --- 2607,2612 ---- void pd_doloadbang(void); /* LATER figure out how to log errors */ ! void binbuf_evalfile(t_symbol *name, t_symbol *dir) { t_binbuf *b = binbuf_new(); int import = !strcmp(name->s_name + strlen(name->s_name) - 4, ".pat"); *************** *** 2617,2630 **** int dspstate = canvas_suspend_dsp(); glob_setfilename(0, name, dir); ! if (binbuf_read(b, name->s_name, dir->s_name, 0)) { ! perror(name->s_name); } else { ! if (import) { ! t_binbuf *newb = binbuf_convert(b, 1); ! binbuf_free(b); ! b = newb; ! } ! binbuf_eval(b, 0, 0, 0); } glob_setfilename(0, &s_, &s_); /* bug fix by Krzysztof Czaja */ binbuf_free(b); --- 2614,2626 ---- int dspstate = canvas_suspend_dsp(); glob_setfilename(0, name, dir); ! if (import) { ! if (binbuf_read(b, name->s_name, dir->s_name, 0)) {perror(name->s_name); goto bye;} ! t_binbuf *newb = binbuf_convert(b, 1); ! binbuf_free(b); ! b = newb; } else { ! if (binbuf_read(b, name->s_name, dir->s_name, 2)) perror(name->s_name); } + bye: glob_setfilename(0, &s_, &s_); /* bug fix by Krzysztof Czaja */ binbuf_free(b); *************** *** 2634,2646 **** void glob_evalfile(t_pd *ignore, t_symbol *name, t_symbol *dir) { t_pd *x = 0; ! /* even though binbuf_evalfile appears to take care of dspstate, ! we have to do it again here, because canvas_startdsp() assumes ! that all toplevel canvases are visible. LATER check if this ! is still necessary -- probably not. */ ! int dspstate = canvas_suspend_dsp(); binbuf_evalfile(name, dir); while ((x != s__X.s_thing) && (x = s__X.s_thing)) ! vmess(x, gensym("pop"), "i", 1); pd_doloadbang(); canvas_resume_dsp(dspstate); --- 2630,2641 ---- void glob_evalfile(t_pd *ignore, t_symbol *name, t_symbol *dir) { t_pd *x = 0; ! /* even though binbuf_evalfile appears to take care of dspstate, ! we have to do it again here, because canvas_startdsp() assumes ! that all toplevel canvases are visible. ! LATER: check if this is still necessary -- probably not. */ int dspstate = canvas_suspend_dsp(); binbuf_evalfile(name, dir); while ((x != s__X.s_thing) && (x = s__X.s_thing)) ! vmess(x, gensym("pop"), "i", 1); pd_doloadbang(); canvas_resume_dsp(dspstate); Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.20 retrieving revision 1.1.2.49.2.21 diff -C2 -d -r1.1.2.49.2.20 -r1.1.2.49.2.21 *** desire.h 31 Dec 2006 16:39:15 -0000 1.1.2.49.2.20 --- desire.h 31 Dec 2006 19:21:38 -0000 1.1.2.49.2.21 *************** *** 268,272 **** /* from kernel.c */ EXTERN void gobj_save(t_gobj *x, t_binbuf *b); ! EXTERN void pd_eval_text(char *t); EXTERN int sys_syntax; --- 268,272 ---- /* from kernel.c */ EXTERN void gobj_save(t_gobj *x, t_binbuf *b); ! EXTERN void pd_eval_text(char *t, size_t size); EXTERN int sys_syntax; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.99 retrieving revision 1.1.2.217.2.100 diff -C2 -d -r1.1.2.217.2.99 -r1.1.2.217.2.100 *** desire.c 31 Dec 2006 16:39:15 -0000 1.1.2.217.2.99 --- desire.c 31 Dec 2006 19:21:38 -0000 1.1.2.217.2.100 *************** *** 1441,1444 **** --- 1441,1446 ---- and float-arrays. */ + void pd_eval_text2(char *s) {pd_eval_text(s,strlen(s));} + extern "C" void garray_init(void) { hack = 0; /* invisible canvases must be, uh, invisible */ *************** *** 1446,1450 **** t_binbuf *b = binbuf_new(); glob_setfilename(0, gensym("_float"), gensym(".")); ! pd_eval_text( "#N canvas 0 0 458 153 10;\n" "#X obj 43 31 struct _float_array array z float float style float linewidth float color;\n" --- 1448,1452 ---- t_binbuf *b = binbuf_new(); glob_setfilename(0, gensym("_float"), gensym(".")); ! pd_eval_text2( "#N canvas 0 0 458 153 10;\n" "#X obj 43 31 struct _float_array array z float float style float linewidth float color;\n" *************** *** 1452,1456 **** vmess(s__X.s_thing, gensym("pop"), "i", 0); glob_setfilename(0, gensym("_float_array"), gensym(".")); ! pd_eval_text( "#N canvas 0 0 458 153 10;\n" "#X obj 39 26 struct float float y;\n"); --- 1454,1458 ---- vmess(s__X.s_thing, gensym("pop"), "i", 0); glob_setfilename(0, gensym("_float_array"), gensym(".")); ! pd_eval_text2( "#N canvas 0 0 458 153 10;\n" "#X obj 39 26 struct float float y;\n"); *************** *** 2766,2770 **** else if (*format->s_name) pd_error(x,"canvas_read: unknown flag: %s", format->s_name); ! if (binbuf_read_via_path(b, filename->s_name, canvas_getdir(canvas)->s_name, cr)) { pd_error(x, "read failed"); binbuf_free(b); --- 2768,2773 ---- else if (*format->s_name) pd_error(x,"canvas_read: unknown flag: %s", format->s_name); ! /* flag 2 means eval continuously. this is required to autodetect the syntax */ ! if (binbuf_read_via_path(b, filename->s_name, canvas_getdir(canvas)->s_name, cr|2)) { pd_error(x, "read failed"); binbuf_free(b); *************** *** 2773,2782 **** if (wasvis) canvas_vis(canvas, 0); if (clearme) canvas_clear(x); ! canvas_readfrombinbuf(x, b, filename->s_name, 0); if (wasvis) canvas_vis(canvas, 1); binbuf_free(b); } ! static void canvas_read(t_canvas *x, t_symbol *filename, t_symbol *format) {canvas_doread(x,filename,format,1);} static void canvas_mergefile(t_canvas *x, t_symbol *filename, t_symbol *format) {canvas_doread(x,filename,format,0);} --- 2776,2785 ---- if (wasvis) canvas_vis(canvas, 0); if (clearme) canvas_clear(x); ! /* canvas_readfrombinbuf(x, b, filename->s_name, 0); */ /* what's this for? */ if (wasvis) canvas_vis(canvas, 1); binbuf_free(b); } ! static void canvas_read( t_canvas *x, t_symbol *filename, t_symbol *format) {canvas_doread(x,filename,format,1);} static void canvas_mergefile(t_canvas *x, t_symbol *filename, t_symbol *format) {canvas_doread(x,filename,format,0);} *************** *** 7352,7357 **** char *dirresult, char **nameresult, unsigned int size, int bin) { int fd = -1; - t_canvas *y; - /* first check if "name" is absolute (and if so, try to open) */ if (sys_open_absolute(name, ext, dirresult, nameresult, size, bin, &fd)) return fd; --- 7355,7358 ---- *************** *** 7359,7369 **** /* otherwise "name" is relative; start trying in directories named in this and parent environments */ ! for (y = x; y; y = y->owner) if (y->env) { t_namelist *nl; t_canvas *x2 = x; while (x2 && x2->owner) x2 = x2->owner; const char *dir = x2 ? canvas_getdir(x2)->s_name : "."; ! for (nl = y->env->path; nl; nl = nl->nl_next) ! { char realname[MAXPDSTRING]; strncpy(realname, dir, MAXPDSTRING); --- 7360,7369 ---- /* otherwise "name" is relative; start trying in directories named in this and parent environments */ ! for (t_canvas *y=x; y; y = y->owner) if (y->env) { t_namelist *nl; t_canvas *x2 = x; while (x2 && x2->owner) x2 = x2->owner; const char *dir = x2 ? canvas_getdir(x2)->s_name : "."; ! for (nl = y->env->path; nl; nl = nl->nl_next) { char realname[MAXPDSTRING]; strncpy(realname, dir, MAXPDSTRING);

1 0

pd/src desire.tk,1.1.2.600.2.146,1.1.2.600.2.147
by chunlee 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16226 Modified Files: Tag: desiredata desire.tk Log Message: first attempts on subpatcherize that perserves the connection Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.146 retrieving revision 1.1.2.600.2.147 diff -C2 -d -r1.1.2.600.2.146 -r1.1.2.600.2.147 *** desire.tk 31 Dec 2006 00:35:26 -0000 1.1.2.600.2.146 --- desire.tk 31 Dec 2006 18:49:19 -0000 1.1.2.600.2.147 *************** *** 297,300 **** --- 297,307 ---- set subpatcherize(edit) 0 set subpatcherize(paste) 0 + set subpatcherize(incoming) {} + set subpatcherize(incoming_inlet) {} + set subpatcherize(incoming_outlet) {} + set subpatcherize(outgoing) {} + set subpatcherize(outgoing_inlet) {} + set subpatcherize(outgoing_outlet) {} + #-----------------------------------------------------------------------------------# # adapted from matju's MetaRuby (UndoQueue.rb) *************** *** 2397,2401 **** } else { if {$subpatcherize(paste)} {set subpatherize(paste) 0} ! if {$subpatcherize(edit)} {set subpatherize(edit) 0} } --- 2404,2408 ---- } else { if {$subpatcherize(paste)} {set subpatherize(paste) 0} ! if {$subpatcherize(edit)} {set subpatherize(edit) 0; $self draw_wires} } *************** *** 3287,3291 **** --- 3294,3312 ---- def Canvas new_object_subpatcherize {subpatch} {$subpatch subpatcherize_paste} + def Canvas new_object_subpatcherize_inletconnect {inlet obj} { + puts " inlet::: $inlet" + if {[regexp {^[0-9]{1,8}i} $inlet idx]} {set idx [string trimright $idx i]} + if {[regexp {i[0-9]{1,8}} $inlet port]} {set port [string trimleft $port i]} + $self connect [list [lsearch $@children $obj] 0 $idx $port] + } + def Canvas new_object_subpatcherize_outletconnect {outlet obj} { + if {[regexp {^[0-9]{1,8}o} $outlet idx]} {set idx [string trimright $idx o]} + if {[regexp {o[0-9]{1,8}} $outlet port]} {set port [string trimleft $port o]} + $self connect [list $idx $port [lsearch $@children $obj] 0] + } def Canvas subpatcherize {} { + set ::subpatcherize(incoming) {}; set ::subpatcherize(outgoing) {} + set ::subpatcherize(incoming_inlet) {}; set ::subpatcherize(incoming_outlet) {} + set ::subpatcherize(outgoing_inlet) {}; set ::subpatcherize(outgoing_outlet) {} if {![llength $@selection]} {return} set x 0; set y 0 *************** *** 3297,3308 **** set x [expr $x / [llength $@selection]] set y [expr $y / [llength $@selection]] $self cut netsend [list .$self "push"] netsend [list #N canvas 0 0 450 300 sub 0] [list $self new_object_subpatcherize] netsend [list #X restore $x $y pd sub] netsend [list .$self "pop"] } ! def Canvas subpatcherize_paste {} { global subpatcherize set subpatcherize(paste) 1 set in 0 --- 3318,3407 ---- set x [expr $x / [llength $@selection]] set y [expr $y / [llength $@selection]] + $self subpatcherize_outside $self cut + $self subpatcherize_make_sub $x $y + } + + def Canvas subpatcherize_make_sub {x y} { netsend [list .$self "push"] netsend [list #N canvas 0 0 450 300 sub 0] [list $self new_object_subpatcherize] netsend [list #X restore $x $y pd sub] netsend [list .$self "pop"] + } ! ! def Canvas subpatcherize_outside {} { ! foreach x $@selection { ! foreach wire [$x wires2] {$self subpatcherize_outside_wire $x $wire} ! } ! } ! def Canvas subpatcherize_outside_wire {x wire} { ! set wire_list [$wire report] ! switch [lsearch $wire_list $x] { ! 0 { ! set obj [lindex $wire_list 2] ! if {[lsearch $@selection $obj] < 0} { ! set outlet [lindex $wire_list 1] ! set x_idx [lsearch $@selection $x] ! set obj_out ${x_idx}o${outlet} ! if {[lsearch $::subpatcherize(outgoing_outlet) $obj_out] < 0} { ! lappend ::subpatcherize(outgoing_outlet) $obj_out ! } ! set inlet [lindex $wire_list 3] ! set outlet [lsearch $::subpatcherize(outgoing_outlet) $obj_out] ! lappend ::subpatcherize(outgoing) [list last $outlet $obj $inlet] ! set obj_in ${obj}i${inlet} ! if {[lsearch $::subpatcherize(outgoing_inlet) $obj_in] < 0} { ! lappend ::subpatcherize(outgoing_inlet) $obj_in ! } ! } ! } ! 2 { ! set obj [lindex $wire_list 0] ! if {[lsearch $@selection $obj] < 0} { ! set inlet [lindex $wire_list 3] ! set x_idx [lsearch $@selection $x] ! set obj_in ${x_idx}i${inlet} ! if {[lsearch $::subpatcherize(incoming_inlet) $obj_in] < 0} { ! lappend ::subpatcherize(incoming_inlet) $obj_in ! } ! set outlet [lindex $wire_list 1] ! set inlet [lsearch $::subpatcherize(incoming_inlet) $obj_in] ! lappend ::subpatcherize(incoming) [list $obj $outlet last $inlet] ! set obj_out ${obj}o${outlet} ! if {[lsearch $::subpatcherize(incoming_outlet) $obj_out] < 0} { ! lappend ::subpatcherize(incoming_outlet) $obj_out ! } ! } ! } ! } ! puts "-------------------------------------" ! puts " in:::: $::subpatcherize(incoming)" ! puts " incoming_outlet:: $::subpatcherize(incoming_outlet) " ! puts " incoming_inlet::: $::subpatcherize(incoming_inlet)" ! puts "-------------------------------------" ! puts " out:::: $::subpatcherize(outgoing)" ! puts " outgoing_outlet:: $::subpatcherize(outgoing_outlet) " ! puts " outgoing_inlet::: $::subpatcherize(outgoing_inlet)" ! puts "-------------------------------------" ! ! } ! def Canvas subpatcherize_makeports {} { global subpatcherize + set i 0 + foreach inlet $::subpatcherize(incoming_inlet) { + netsend [list #X obj [expr $i*100] 0 inlet] \ + [list $self new_object_subpatcherize_inletconnect $inlet] + incr i + } + set i 0 + foreach outlet $::subpatcherize(outgoing_outlet) { + netsend [list #X obj [expr $i*100] 200 outlet] \ + [list $self new_object_subpatcherize_outletconnect $outlet] + incr i + } + } + + def Canvas subpatcherize_paste {} { set subpatcherize(paste) 1 set in 0 *************** *** 3310,3318 **** netsend [list .$self "push"] foreach mess [pd_mess_split [$::clipboard value]] {netsend $mess} netsend [list #X pop 1] ! set subpatcherize(edit) 1 $self edit } def Canvas end_action {} { switch -- $@action { --- 3409,3436 ---- netsend [list .$self "push"] foreach mess [pd_mess_split [$::clipboard value]] {netsend $mess} + $self subpatcherize_makeports netsend [list #X pop 1] ! $self subpatcherize_reconnect_outside ! set ::subpatcherize(edit) 1 $self edit } + def Canvas subpatcherize_reconnect_outside {} { + foreach wire $::subpatcherize(incoming) { + set canvas [$self canvas] + set from [lsearch [$canvas children] [lindex $wire 0]] + set to [lsearch [[$self canvas] children] $self] + set wire2 [list $from [lindex $wire 1] $to [lindex $wire 3]] + $canvas connect $wire2 + } + foreach wire $::subpatcherize(outgoing) { + set canvas [$self canvas] + set to [lsearch [$canvas children] [lindex $wire 2]] + set from [lsearch [[$self canvas] children] $self] + set wire2 [list $from [lindex $wire 1] $to [lindex $wire 3]] + $canvas connect $wire2 + } + } + def Canvas end_action {} { switch -- $@action {

1 0

pd/src x_qlist.c,1.2.8.3.2.1,1.2.8.3.2.2
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3091 Modified Files: Tag: desiredata x_qlist.c Log Message: 0.40 Index: x_qlist.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_qlist.c,v retrieving revision 1.2.8.3.2.1 retrieving revision 1.2.8.3.2.2 diff -C2 -d -r1.2.8.3.2.1 -r1.2.8.3.2.2 *** x_qlist.c 20 Dec 2006 08:14:25 -0000 1.2.8.3.2.1 --- x_qlist.c 31 Dec 2006 16:47:29 -0000 1.2.8.3.2.2 *************** *** 174,188 **** } ! static void qlist_read(t_qlist *x, t_symbol *filename, t_symbol *format) ! { int cr = 0; ! if (!strcmp(format->s_name, "cr")) ! cr = 1; ! else if (*format->s_name) ! error("qlist_read: unknown flag: %s", format->s_name); ! ! if (binbuf_read_via_path(x->x_binbuf, filename->s_name, ! canvas_getdir(x->x_canvas)->s_name, cr)) ! error("%s: read failed", filename->s_name); x->x_onset = 0x7fffffff; x->x_reentered = 1; --- 174,183 ---- } ! static void qlist_read(t_qlist *x, t_symbol *filename, t_symbol *format) { int cr = 0; ! if (!strcmp(format->s_name, "cr")) cr = 1; ! else if (*format->s_name) error("qlist_read: unknown flag: %s", format->s_name); ! if (binbuf_read_via_canvas(x->x_binbuf, filename->s_name, x->x_canvas, cr)) ! error("%s: read failed", filename->s_name); x->x_onset = 0x7fffffff; x->x_reentered = 1;

1 0

pd/src desire.h, 1.1.2.49.2.19, 1.1.2.49.2.20 desire.c, 1.1.2.217.2.98, 1.1.2.217.2.99 kernel.c, 1.1.2.18, 1.1.2.19
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv314 Modified Files: Tag: desiredata desire.h desire.c kernel.c Log Message: introducing pd_eval_text Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -C2 -d -r1.1.2.18 -r1.1.2.19 *** kernel.c 31 Dec 2006 09:14:28 -0000 1.1.2.18 --- kernel.c 31 Dec 2006 16:39:17 -0000 1.1.2.19 *************** *** 1851,1865 **** } void binbuf_text(t_binbuf *x, char *t, size_t size) { char *end=t+size; binbuf_clear(x); ! if (0) { ! while (t!=end) t=binbuf_text_matju(x,t,end); ! } else { ! while (t!=end) t=binbuf_text_miller(x,t,end); ! } binbuf_capa(x,x->n); } /* convert a binbuf to text; no null termination. */ void binbuf_gettext(t_binbuf *x, char **bufp, int *lengthp) { --- 1851,1877 ---- } + int sys_syntax = 0; + void binbuf_text(t_binbuf *x, char *t, size_t size) { char *end=t+size; binbuf_clear(x); ! while (t!=end) t = sys_syntax ? binbuf_text_matju(x,t,end) : binbuf_text_miller(x,t,end); binbuf_capa(x,x->n); } + void pd_eval_text(char *t) { + t_binbuf *x = binbuf_new(); + char *end = t + strlen(t); + while (t!=end) { + t = sys_syntax ? binbuf_text_matju(x,t,end) : binbuf_text_miller(x,t,end); + if (x->n && x->vec[x->n-1].a_type == A_SEMI) { + fprintf(stderr,"pd_eval_text semi n=%d\n",x->n); + binbuf_eval(x,0,0,0); + binbuf_clear(x); + } + } + binbuf_free(x); + } + /* convert a binbuf to text; no null termination. */ void binbuf_gettext(t_binbuf *x, char **bufp, int *lengthp) { *************** *** 2256,2269 **** int binbuf_read(t_binbuf *b, char *filename, char *dirname, int crflag) { long length; - int fd; - int readret; char *buf; char namebuf[MAXPDSTRING]; if (*dirname) sprintf(namebuf,"%s/%s",dirname,filename); else sprintf(namebuf, "%s", filename); ! if ((fd = binbuf_doopen(namebuf, 0)) < 0) { ! error("open: %s: %s",namebuf,strerror(errno)); ! return 1; ! } if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 || !(buf = (char *)t_getbytes(length))) { --- 2268,2277 ---- int binbuf_read(t_binbuf *b, char *filename, char *dirname, int crflag) { long length; char *buf; char namebuf[MAXPDSTRING]; if (*dirname) sprintf(namebuf,"%s/%s",dirname,filename); else sprintf(namebuf, "%s", filename); ! int fd = binbuf_doopen(namebuf, 0); ! if (fd < 0) {error("open: %s: %s",namebuf,strerror(errno)); return 1;} if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 || !(buf = (char *)t_getbytes(length))) { *************** *** 2272,2276 **** return 1; } ! if ((readret = read(fd, buf, length)) < length) { error("read (%d %ld) -> %d; %s: %s\n", fd, length, readret, namebuf, strerror(errno)); close(fd); --- 2280,2285 ---- return 1; } ! int readret = read(fd, buf, length); ! if (readret < length) { error("read (%d %ld) -> %d; %s: %s\n", fd, length, readret, namebuf, strerror(errno)); close(fd); *************** *** 2278,2286 **** return 1; } ! /* optionally map carriage return to semicolon */ ! if (crflag) { ! int i; ! for (i = 0; i < length; i++) if (buf[i] == '\n') buf[i] = ';'; ! } binbuf_text(b, buf, length); t_freebytes(buf, length); --- 2287,2291 ---- return 1; } ! if (crflag) for (int i=0; i<length; i++) if (buf[i]=='\n') buf[i] = ';'; binbuf_text(b, buf, length); t_freebytes(buf, length); *************** *** 2289,2312 **** } ! /* read a binbuf from a file, via the search patch of a canvas */ int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int crflag) { - int filedesc; char buf[MAXPDSTRING], *bufptr; ! if ((filedesc = canvas_open(canvas, filename, "", buf, &bufptr, MAXPDSTRING, 0)) < 0) { ! error("%s: can't open", filename); ! return 1; ! } else close(filedesc); return !!binbuf_read(b, bufptr, buf, crflag); } ! /* old version */ int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, int crflag) { - int filedesc; char buf[MAXPDSTRING], *bufptr; ! if ((filedesc = open_via_path(dirname, filename, "", buf, &bufptr, MAXPDSTRING, 0)) < 0) { ! error("%s: can't open", filename); ! return 1; ! } ! else close (filedesc); return !!binbuf_read(b, bufptr, buf, crflag); } --- 2294,2312 ---- } ! /* read a binbuf from a file, via the search patch of a canvas */ int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int crflag) { char buf[MAXPDSTRING], *bufptr; ! int filedesc = canvas_open(canvas, filename, "", buf, &bufptr, MAXPDSTRING, 0); ! if (filedesc<0) {error("%s: can't open", filename); return 1;} ! close(filedesc); return !!binbuf_read(b, bufptr, buf, crflag); } ! /* old version */ int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, int crflag) { char buf[MAXPDSTRING], *bufptr; ! int filedesc = open_via_path(dirname, filename, "", buf, &bufptr, MAXPDSTRING, 0); ! if (filedesc<0) {error("%s: can't open", filename); return 1;} ! close(filedesc); return !!binbuf_read(b, bufptr, buf, crflag); } Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.19 retrieving revision 1.1.2.49.2.20 diff -C2 -d -r1.1.2.49.2.19 -r1.1.2.49.2.20 *** desire.h 31 Dec 2006 07:26:33 -0000 1.1.2.49.2.19 --- desire.h 31 Dec 2006 16:39:15 -0000 1.1.2.49.2.20 *************** *** 266,271 **** #define PLOTSTYLE_BEZ 2 ! /* from m_pd.c */ EXTERN void gobj_save(t_gobj *x, t_binbuf *b); /* from desire.c */ --- 266,273 ---- #define PLOTSTYLE_BEZ 2 ! /* from kernel.c */ EXTERN void gobj_save(t_gobj *x, t_binbuf *b); + EXTERN void pd_eval_text(char *t); + EXTERN int sys_syntax; /* from desire.c */ Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.98 retrieving revision 1.1.2.217.2.99 diff -C2 -d -r1.1.2.217.2.98 -r1.1.2.217.2.99 *** desire.c 31 Dec 2006 08:05:55 -0000 1.1.2.217.2.98 --- desire.c 31 Dec 2006 16:39:15 -0000 1.1.2.217.2.99 *************** *** 1437,1450 **** static t_pd *garray_arraytemplatecanvas; - static char garray_arraytemplatefile[] = "\ - #N canvas 0 0 458 153 10;\n\ - #X obj 43 31 struct _float_array array z float float style\n\ - float linewidth float color;\n\ - #X obj 43 70 plot z color linewidth 0 0 1 style;\n\ - "; - static char garray_floattemplatefile[] = "\ - #N canvas 0 0 458 153 10;\n\ - #X obj 39 26 struct float float y;\n\ - "; /* create invisible, built-in canvases to determine the templates for floats --- 1437,1440 ---- *************** *** 1456,1465 **** t_binbuf *b = binbuf_new(); glob_setfilename(0, gensym("_float"), gensym(".")); ! binbuf_text(b, garray_floattemplatefile, strlen(garray_floattemplatefile)); ! binbuf_eval(b, 0, 0, 0); vmess(s__X.s_thing, gensym("pop"), "i", 0); glob_setfilename(0, gensym("_float_array"), gensym(".")); ! binbuf_text(b, garray_arraytemplatefile, strlen(garray_arraytemplatefile)); ! binbuf_eval(b, 0, 0, 0); garray_arraytemplatecanvas = s__X.s_thing; vmess(s__X.s_thing, gensym("pop"), "i", 0); --- 1446,1458 ---- t_binbuf *b = binbuf_new(); glob_setfilename(0, gensym("_float"), gensym(".")); ! pd_eval_text( ! "#N canvas 0 0 458 153 10;\n" ! "#X obj 43 31 struct _float_array array z float float style float linewidth float color;\n" ! "#X obj 43 70 plot z color linewidth 0 0 1 style;\n"); vmess(s__X.s_thing, gensym("pop"), "i", 0); glob_setfilename(0, gensym("_float_array"), gensym(".")); ! pd_eval_text( ! "#N canvas 0 0 458 153 10;\n" ! "#X obj 39 26 struct float float y;\n"); garray_arraytemplatecanvas = s__X.s_thing; vmess(s__X.s_thing, gensym("pop"), "i", 0); *************** *** 6476,6479 **** --- 6469,6473 ---- binbuf_addv(b, "ttii", "#X","restore", (t_int)x->x, (t_int)x->y); if (x->binbuf) { + pd_print(x,"pd_upload"); binbuf_addbinbuf(b, x->binbuf); } else {

1 0

pd/src kernel.c,1.1.2.17,1.1.2.18
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1654 Modified Files: Tag: desiredata kernel.c Log Message: more binbuf_addv "t" Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -C2 -d -r1.1.2.17 -r1.1.2.18 *** kernel.c 31 Dec 2006 08:05:57 -0000 1.1.2.17 --- kernel.c 31 Dec 2006 09:14:28 -0000 1.1.2.18 *************** *** 733,738 **** void wire_save (t_wire *self, t_binbuf *b) { t_canvas *c = self->oc_gobj.dix->canvas; ! binbuf_addv(b, "ssiiii;", gensym("#X"), gensym("connect"), ! canvas_getindex(c,(t_gobj *)self->from), self->outlet, canvas_getindex(c,(t_gobj *)self->to), self->inlet); appendix_save((t_gobj *)self,b); } --- 733,739 ---- void wire_save (t_wire *self, t_binbuf *b) { t_canvas *c = self->oc_gobj.dix->canvas; ! binbuf_addv(b,"ttiiii;","#X","connect", ! canvas_getindex(c,(t_gobj *)self->from), self->outlet, ! canvas_getindex(c,(t_gobj *)self->to), self->inlet); appendix_save((t_gobj *)self,b); } *************** *** 1772,1776 **** } *bufp=0; ! binbuf_addv(x,"s",gensym(buf)); return t; /* ignore syntax error (should it?) */ } --- 1773,1777 ---- } *bufp=0; ! binbuf_addv(x,"t",buf); return t; /* ignore syntax error (should it?) */ } *************** *** 1804,1808 **** if (doll) binbuf_addv(x,"$",atoi(buf+1)); else binbuf_addv(x,"&",gensym(buf)); ! } else binbuf_addv(x,"s",gensym(buf)); return t; } --- 1805,1809 ---- if (doll) binbuf_addv(x,"$",atoi(buf+1)); else binbuf_addv(x,"&",gensym(buf)); ! } else binbuf_addv(x,"t",buf); return t; } *************** *** 1846,1850 **** if (dollar) binbuf_addv(x,"$",atoi(buf+1)); else binbuf_addv(x,"&",gensym(buf)); ! } else binbuf_addv(x,"s",gensym(buf)); return t; } --- 1847,1851 ---- if (dollar) binbuf_addv(x,"$",atoi(buf+1)); else binbuf_addv(x,"&",gensym(buf)); ! } else binbuf_addv(x,"t",buf); return t; } *************** *** 1953,1957 **** break; default: ! bug("binbuf_addbinbuf: stray atom of type %d",ap->a_type); } } --- 1954,1960 ---- break; default: ! //bug("binbuf_addbinbuf: stray atom of type %d",ap->a_type); ! //abort(); ! ; } } *************** *** 2390,2394 **** t_int n = oldb->n, nextindex, stackdepth = 0, stack[MAXSTACK], nobj = 0, i; t_atom outmess[MAXSTACK], *nextmess; ! if (!maxtopd) binbuf_addv(newb, "ss;", gensym("max"), gensym("v2")); for (nextindex = 0; nextindex < n; ) { int endmess, natom; --- 2393,2397 ---- t_int n = oldb->n, nextindex, stackdepth = 0, stack[MAXSTACK], nobj = 0, i; t_atom outmess[MAXSTACK], *nextmess; ! if (!maxtopd) binbuf_addv(newb,"tt;","max","v2"); for (nextindex = 0; nextindex < n; ) { int endmess, natom; *************** *** 2428,2432 **** stackdepth++; nobj = 0; ! binbuf_addv(newb, "ssfffff;", gensym("#N"), gensym("canvas"), GETF(2), GETF(3), GETF(4)-GETF(2), GETF(5)-GETF(3), 10.); } --- 2431,2435 ---- stackdepth++; nobj = 0; ! binbuf_addv(newb,"ttfffff;","#N","canvas", GETF(2), GETF(3), GETF(4)-GETF(2), GETF(5)-GETF(3), 10.); } *************** *** 2441,2446 **** if (natom >= 7 && !strcmp(second, "newobj") && (ISSYMBOL(&nextmess[6], "patcher") || ISSYMBOL(&nextmess[6], "p"))) { ! binbuf_addv(newb, "ssffss;", gensym("#X"), gensym("restore"), GETF(2), GETF(3), ! gensym("pd"), atom_getsymbolarg(7, natom, nextmess)); if (stackdepth) stackdepth--; nobj = stack[stackdepth]; --- 2444,2449 ---- if (natom >= 7 && !strcmp(second, "newobj") && (ISSYMBOL(&nextmess[6], "patcher") || ISSYMBOL(&nextmess[6], "p"))) { ! binbuf_addv(newb,"ttffts;","#X","restore", GETF(2), GETF(3), ! "pd", atom_getsymbolarg(7, natom, nextmess)); if (stackdepth) stackdepth--; nobj = stack[stackdepth]; *************** *** 2474,2508 **** nobj++; } else if (!strcmp(second, "button")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), gensym("bng")); nobj++; } else if (!strcmp(second, "number") || !strcmp(second, "flonum")) { ! binbuf_addv(newb, "ssff;", gensym("#X"), gensym("floatatom"), GETF(2), GETF(3)); nobj++; } else if (!strcmp(second, "slider")) { float inc = GETF(7); if (inc <= 0) inc = 1; ! binbuf_addv(newb, "ssffsffffffsssfffffffff;", gensym("#X"), gensym("obj"), ! GETF(2), GETF(3), gensym("vsl"), GETF(4), GETF(5), GETF(6), GETF(6)+(GETF(5)-1)*inc, ! 0., 0., gensym("empty"), gensym("empty"), gensym("empty"), ! 0., -8., 0., 8., -262144., -1., -1., 0., 1.); nobj++; } else if (!strcmp(second, "toggle")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), gensym("tgl")); nobj++; } else if (!strcmp(second, "inlet")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), ! gensym((char *)(natom > 5 ? "inlet~" : "inlet"))); nobj++; } else if (!strcmp(second, "outlet")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), ! gensym((char *)(natom > 5 ? "outlet~" : "outlet"))); nobj++; } else if (!strcmp(second, "user")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(3), GETF(4), ! atom_getsymbolarg(2, natom, nextmess)); nobj++; } else if (!strcmp(second, "connect") || !strcmp(second, "fasten")) { ! binbuf_addv(newb, "ssffff;", gensym("#X"), gensym("connect"), ! nobj-GETF(2)-1, GETF(3), nobj-GETF(4)-1, GETF(5)); } } --- 2477,2509 ---- nobj++; } else if (!strcmp(second, "button")) { ! binbuf_addv(newb,"ttfft;","#X","obj",GETF(2),GETF(3),"bng"); nobj++; } else if (!strcmp(second, "number") || !strcmp(second, "flonum")) { ! binbuf_addv(newb,"ttff;","#X","floatatom",GETF(2),GETF(3)); nobj++; } else if (!strcmp(second, "slider")) { float inc = GETF(7); if (inc <= 0) inc = 1; ! binbuf_addv(newb, "ttfftfffffftttfffffffff;","#X","obj", ! GETF(2), GETF(3), "vsl", GETF(4), GETF(5), GETF(6), GETF(6)+(GETF(5)-1)*inc, ! 0., 0., "empty", "empty", "empty", 0., -8., 0., 8., -262144., -1., -1., 0., 1.); nobj++; } else if (!strcmp(second, "toggle")) { ! binbuf_addv(newb,"ttfft;","#X","obj",GETF(2),GETF(3),"tgl"); nobj++; } else if (!strcmp(second, "inlet")) { ! binbuf_addv(newb,"ttfft;","#X","obj",GETF(2),GETF(3), ! (char *)(natom > 5 ? "inlet~" : "inlet")); nobj++; } else if (!strcmp(second, "outlet")) { ! binbuf_addv(newb,"ttfft;","#X","obj", GETF(2), GETF(3), ! (char *)(natom > 5 ? "outlet~" : "outlet")); nobj++; } else if (!strcmp(second, "user")) { ! binbuf_addv(newb,"ttffs;","#X","obj", GETF(3), GETF(4), atom_getsymbolarg(2, natom, nextmess)); nobj++; } else if (!strcmp(second, "connect") || !strcmp(second, "fasten")) { ! binbuf_addv(newb,"ttffff;","#X","connect", ! nobj-GETF(2)-1, GETF(3), nobj-GETF(4)-1, GETF(5)); } } *************** *** 2517,2529 **** stackdepth++; nobj = 0; ! binbuf_addv(newb, "ssffff;", gensym("#N"), gensym("vpatcher"), ! GETF(2), GETF(3), GETF(4), GETF(5)); } } if (!strcmp(first, "#X")) { if (natom >= 5 && !strcmp(second, "restore") && (ISSYMBOL (&nextmess[4], "pd"))) { ! binbuf_addv(newb, "ss;", gensym("#P"), gensym("pop")); ! binbuf_addv(newb, "ssffffss;", gensym("#P"), gensym("newobj"), GETF(2), GETF(3), 50., 1., ! gensym("patcher"), atom_getsymbolarg(5, natom, nextmess)); if (stackdepth) stackdepth--; nobj = stack[stackdepth]; --- 2518,2529 ---- stackdepth++; nobj = 0; ! binbuf_addv(newb,"ttffff;","#N","vpatcher", GETF(2), GETF(3), GETF(4), GETF(5)); } } if (!strcmp(first, "#X")) { if (natom >= 5 && !strcmp(second, "restore") && (ISSYMBOL (&nextmess[4], "pd"))) { ! binbuf_addv(newb,"tt;","#P","pop"); ! binbuf_addv(newb,"ttffffts;","#P","newobj", GETF(2), GETF(3), 50., 1., ! "patcher", atom_getsymbolarg(5, natom, nextmess)); if (stackdepth) stackdepth--; nobj = stack[stackdepth]; *************** *** 2532,2551 **** t_symbol *classname = atom_getsymbolarg(4, natom, nextmess); if (classname == gensym("inlet")) ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("inlet"), GETF(2), GETF(3), 15.); else if (classname == gensym("inlet~")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("inlet"), GETF(2), GETF(3), 15., 1.); else if (classname == gensym("outlet")) ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("outlet"), GETF(2), GETF(3), 15.); else if (classname == gensym("outlet~")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("outlet"), GETF(2), GETF(3), 15., 1.); else if (classname == gensym("bng")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("button"), GETF(2), GETF(3), GETF(5), 0.); else if (classname == gensym("tgl")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("toggle"), GETF(2), GETF(3), GETF(5), 0.); else if (classname == gensym("vsl")) ! binbuf_addv(newb, "ssffffff;", gensym("#P"), gensym("slider"), ! GETF(2), GETF(3), GETF(5), GETF(6), ! (GETF(8)-GETF(7)) / (GETF(6)==1?1:GETF(6)-1), ! GETF(7)); else { SETSYMBOL(outmess, gensym("#P")); --- 2532,2549 ---- t_symbol *classname = atom_getsymbolarg(4, natom, nextmess); if (classname == gensym("inlet")) ! binbuf_addv(newb,"ttfff;","#P","inlet", GETF(2), GETF(3), 15.); else if (classname == gensym("inlet~")) ! binbuf_addv(newb,"ttffff;","#P","inlet", GETF(2), GETF(3), 15., 1.); else if (classname == gensym("outlet")) ! binbuf_addv(newb,"ttfff;","#P","outlet", GETF(2), GETF(3), 15.); else if (classname == gensym("outlet~")) ! binbuf_addv(newb,"ttffff;","#P","outlet", GETF(2), GETF(3), 15., 1.); else if (classname == gensym("bng")) ! binbuf_addv(newb,"ttffff;","#P","button", GETF(2), GETF(3), GETF(5), 0.); else if (classname == gensym("tgl")) ! binbuf_addv(newb,"ttffff;","#P","toggle", GETF(2), GETF(3), GETF(5), 0.); else if (classname == gensym("vsl")) ! binbuf_addv(newb,"ttffffff;","#P","slider", GETF(2), GETF(3), GETF(5), GETF(6), ! (GETF(8)-GETF(7)) / (GETF(6)==1?1:GETF(6)-1), GETF(7)); else { SETSYMBOL(outmess, gensym("#P")); *************** *** 2573,2580 **** nobj++; } else if (!strcmp(second, "floatatom")) { ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("flonum"), GETF(2), GETF(3), 35); nobj++; } else if (!strcmp(second, "connect")) { ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("connect"), nobj-GETF(2)-1, GETF(3), nobj-GETF(4)-1, GETF(5)); } --- 2571,2578 ---- nobj++; } else if (!strcmp(second, "floatatom")) { ! binbuf_addv(newb, "ttfff;", "#P", "flonum", GETF(2), GETF(3), 35); nobj++; } else if (!strcmp(second, "connect")) { ! binbuf_addv(newb, "ttffff;", "#P", "connect", nobj-GETF(2)-1, GETF(3), nobj-GETF(4)-1, GETF(5)); } *************** *** 2583,2588 **** nextindex = endmess + 1; } ! if (!maxtopd) ! binbuf_addv(newb, "ss;", gensym("#P"), gensym("pop")); #if 0 binbuf_write(newb, "import-result.pd", "/tmp", 0); --- 2581,2585 ---- nextindex = endmess + 1; } ! if (!maxtopd) binbuf_addv(newb, "tt;", "#P", "pop"); #if 0 binbuf_write(newb, "import-result.pd", "/tmp", 0);

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