Pd-cvs June 2006

pd-cvs@lists.iem.at

13 participants
225 discussions

externals/zexy/examples msgfile.pd,1.3,1.4
by IOhannes m zmölnig 27 Jun '06

27 Jun '06

Update of /cvsroot/pure-data/externals/zexy/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30605/examples Modified Files: msgfile.pd Log Message: added a new writing mode: '$$' which converts occurences of "$$" to "\$", in order to be able to write pd-patches which make use of arguments Index: msgfile.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/examples/msgfile.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** msgfile.pd 8 Jun 2006 10:45:33 -0000 1.3 --- msgfile.pd 27 Jun 2006 16:44:42 -0000 1.4 *************** *** 113,117 **** #X connect 22 0 0 0; #X restore 443 104 pd editing; ! #N canvas -25 21 576 302 searching 0; #X obj 54 272 outlet; #X msg 70 180 find test 6; --- 113,117 ---- #X connect 22 0 0 0; #X restore 443 104 pd editing; ! #N canvas 0 21 576 302 searching 0; #X obj 54 272 outlet; #X msg 70 180 find test 6; *************** *** 131,139 **** #X connect 6 0 0 0; #X restore 443 124 pd searching; ! #N canvas 0 0 626 356 file-i/o 0; ! #X obj 54 272 outlet; ! #X text 195 75 read a file; ! #X text 229 96 write one; ! #X text 254 164 write a file \, terminating lines only with carriage return (omitting semicolons.) You can read files this way too \, in which case carriage returns are mapped to semicolons.; --- 131,139 ---- #X connect 6 0 0 0; #X restore 443 124 pd searching; ! #N canvas 0 0 853 402 file-i/o 0; ! #X obj 54 312 outlet; ! #X text 265 75 read a file; ! #X text 299 96 write one; ! #X text 305 164 write a file \, terminating lines only with carriage return (omitting semicolons.) You can read files this way too \, in which case carriage returns are mapped to semicolons.; *************** *** 144,154 **** #X text 51 26 reading from and writing the contents of [msgfile] to files; #X connect 4 0 0 0; #X connect 5 0 0 0; #X connect 6 0 0 0; #X connect 7 0 0 0; #X restore 443 144 pd file-i/o; ! #N canvas 0 0 450 199 misc 0; ! #X obj 84 142 outlet; #X msg 84 112 print; #X text 40 72 miscellaneous functionality of [msgfile]; --- 144,160 ---- #X text 51 26 reading from and writing the contents of [msgfile] to files; + #X msg 111 248 write /tmp/msgfile3.txt $$; + #X text 331 238 on writing replace every occurence of $$ with a single + $. This way you can write pd-patches which can handle arguments.; + #X msg 146 291 add #X obj f $$1; #X connect 4 0 0 0; #X connect 5 0 0 0; #X connect 6 0 0 0; #X connect 7 0 0 0; + #X connect 9 0 0 0; + #X connect 11 0 0 0; #X restore 443 144 pd file-i/o; ! #N canvas 0 0 450 397 misc 0; ! #X obj 84 282 outlet; #X msg 84 112 print; #X text 40 72 miscellaneous functionality of [msgfile];

1 0

pd/src m_sched.c,1.5.4.35.2.15,1.5.4.35.2.16
by Thomas Grill 27 Jun '06

27 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27165/src Modified Files: Tag: devel_0_39 m_sched.c Log Message: fixed typo Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.15 retrieving revision 1.5.4.35.2.16 diff -C2 -d -r1.5.4.35.2.15 -r1.5.4.35.2.16 *** m_sched.c 27 Jun 2006 15:47:46 -0000 1.5.4.35.2.15 --- m_sched.c 27 Jun 2006 16:31:17 -0000 1.5.4.35.2.16 *************** *** 890,893 **** void sys_lock_timeout_notification(void) { ! sys_callback(sys_xrun_notification_callback, 0, 0); } --- 890,894 ---- void sys_lock_timeout_notification(void) { ! sys_callback(sys_lock_timeout_notification_callback, 0, 0); } +

1 0

pd/src m_glob.c, 1.4.4.2.2.9, 1.4.4.2.2.10 m_sched.c, 1.5.4.35.2.14, 1.5.4.35.2.15 s_audio_portaudio.c, 1.1.2.11, 1.1.2.12
by Tim Blechmann 27 Jun '06

27 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7756 Modified Files: Tag: devel_0_39 m_glob.c m_sched.c s_audio_portaudio.c Log Message: notification about sys_lock timeout to pd receiver Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.14 retrieving revision 1.5.4.35.2.15 diff -C2 -d -r1.5.4.35.2.14 -r1.5.4.35.2.15 *** m_sched.c 25 Jun 2006 17:45:20 -0000 1.5.4.35.2.14 --- m_sched.c 27 Jun 2006 15:47:46 -0000 1.5.4.35.2.15 *************** *** 875,876 **** --- 875,893 ---- sys_callback(sys_xrun_notification_callback, 0, 0); } + + + static t_int sys_lock_timeout_notification_callback(t_int * dumy) + { + t_symbol * pd = gensym("pd"); + t_symbol * timeout = gensym("sys_lock_timeout"); + + typedmess(pd->s_thing, timeout, 0, 0); + + return 0; + } + + + void sys_lock_timeout_notification(void) + { + sys_callback(sys_xrun_notification_callback, 0, 0); + } Index: s_audio_portaudio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** s_audio_portaudio.c 25 Jun 2006 17:37:42 -0000 1.1.2.11 --- s_audio_portaudio.c 27 Jun 2006 15:47:46 -0000 1.1.2.12 *************** *** 310,313 **** --- 310,315 ---- void run_all_idle_callbacks(void); + void sys_lock_timeout_notification(void); + int process (const void *input, void *output, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo, *************** *** 321,331 **** if (statusFlags) ! post("statusFlags %p", statusFlags); if (sys_timedlock(timeout) == ETIMEDOUT) /* we're late */ { ! post("timeout %d", timeout); ! sys_log_error(ERR_SYSLOCK); return 0; } --- 323,332 ---- if (statusFlags) ! sys_xrun_notification(); if (sys_timedlock(timeout) == ETIMEDOUT) /* we're late */ { ! sys_lock_timeout_notification(); return 0; } Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.4.4.2.2.9 retrieving revision 1.4.4.2.2.10 diff -C2 -d -r1.4.4.2.2.9 -r1.4.4.2.2.10 *** m_glob.c 25 Jun 2006 17:37:42 -0000 1.4.4.2.2.9 --- m_glob.c 27 Jun 2006 15:47:46 -0000 1.4.4.2.2.10 *************** *** 87,90 **** --- 87,92 ---- if (s == gensym("audio_started")) return; + if (s == gensym("sys_lock_timeout")) + return; startpost("%s: unknown message %s ", class_getname(pd_class(x)),

1 0

externals/grill/flext/source flatom_pr.cpp,1.24,1.25
by Thomas Grill 27 Jun '06

27 Jun '06

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1225/source Modified Files: flatom_pr.cpp Log Message: stripped unneeded code cosmetic changes to calm the compiler Index: flatom_pr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flatom_pr.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flatom_pr.cpp 20 Jun 2006 00:04:11 -0000 1.24 --- flatom_pr.cpp 26 Jun 2006 23:46:13 -0000 1.25 *************** *** 34,39 **** } else if(IsSymbol(a)) { - FLEXT_ASSERT(IsSymbol(a)); - const char *c = GetString(a); size_t len = strlen(c); --- 34,37 ----

1 0

externals/grill/vasp/source oploop.h,1.4,1.5
by Thomas Grill 27 Jun '06

27 Jun '06

Update of /cvsroot/pure-data/externals/grill/vasp/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv797/source Modified Files: oploop.h Log Message: fixed break condition for some loop constructs resurrected help message functionality preparing RIP release Index: oploop.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vasp/source/oploop.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** oploop.h 19 Mar 2003 04:36:15 -0000 1.4 --- oploop.h 26 Jun 2006 23:45:31 -0000 1.5 *************** *** 3,7 **** VASP modular - vector assembling signal processor / objects for Max/MSP and PD ! Copyright (c) 2002 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- VASP modular - vector assembling signal processor / objects for Max/MSP and PD ! Copyright (c) 2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 17,34 **** #ifdef FLEXT_THREADS - /* - #define _D_LOOP(VAR,LEN) { \ - register I __i__; \ - for(__i__ = 0; __i__ < LEN; flext_base::ThrYield()) { \ - I __m__ = _D_MIN(LEN,__i__+_D_BLOCK); for(; (VAR = __i__) < __m__; ++__i__) { - #define _E_LOOP } if(__i__ < __m__) break; }} - */ #define _D_LOOP(VAR,LEN) { \ ! for(VAR = 0; VAR < LEN; flext_base::ThrYield()) { \ ! register const I __m__ = _D_MIN(LEN,VAR+_D_BLOCK); \ ! for(; VAR < __m__; ++VAR) { ! #define _E_LOOP }}} #define _D_WHILE(COND) { \ --- 17,27 ---- #ifdef FLEXT_THREADS #define _D_LOOP(VAR,LEN) { \ ! for(register int __i__ = 0; __i__ < LEN; flext_base::ThrYield()) { \ ! register const I __m__ = _D_MIN(LEN,__i__+_D_BLOCK); \ ! for(; __i__ < __m__; ++__i__) { VAR = __i__; ! #define _E_LOOP } if(__i__ < __m__) break; }} #define _D_WHILE(COND) { \

1 0

externals/grill/vasp changes.txt, 1.19, 1.20 readme.txt, 1.5, 1.6 vasp.vcproj, 1.10, 1.11
by Thomas Grill 27 Jun '06

27 Jun '06

Update of /cvsroot/pure-data/externals/grill/vasp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv797 Modified Files: changes.txt readme.txt vasp.vcproj Log Message: fixed break condition for some loop constructs resurrected help message functionality preparing RIP release Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vasp/changes.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** changes.txt 10 Dec 2005 21:57:13 -0000 1.19 --- changes.txt 26 Jun 2006 23:45:31 -0000 1.20 *************** *** 3,6 **** --- 3,7 ---- 0.1.4: - FIX: resurrect help message-functionality and add some missing help texts + - FIX: break condition for some loop constructs (thanks to Patrick King) 0.1.3: Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vasp/readme.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** readme.txt 25 Mar 2005 04:53:19 -0000 1.5 --- readme.txt 26 Jun 2006 23:45:31 -0000 1.6 *************** *** 2,6 **** Object library for Max/MSP and PD ! Copyright (c) 2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 2,6 ---- Object library for Max/MSP and PD ! Copyright (c) 2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. Index: vasp.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vasp/vasp.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** vasp.vcproj 10 Dec 2005 21:57:13 -0000 1.10 --- vasp.vcproj 26 Jun 2006 23:45:31 -0000 1.11 *************** *** 99,107 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="pthreadVC.lib pd.lib" OutputFile=".\pd-msvc\td/vasp.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\programme\audio\pd\bin" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\td/vasp.pdb" --- 99,107 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="pthreadVC2.lib pd.lib" OutputFile=".\pd-msvc\td/vasp.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\data\pd\pd-cvs\bin;c:\data\prog\packs\pthreads\lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\td/vasp.pdb"

1 0

externals/zexy/abs uniqsym-help.pd, NONE, 1.1 uniqsym.pd, NONE, 1.1
by IOhannes m zmölnig 26 Jun '06

26 Jun '06

Update of /cvsroot/pure-data/externals/zexy/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9273 Added Files: uniqsym-help.pd uniqsym.pd Log Message: remove duplicate symbols --- NEW FILE: uniqsym.pd --- #N canvas 144 0 541 589 10; #X obj 26 104 inlet; #X obj 123 178 symbol; #X msg 26 246 compact \, sort \, bang \, dump; #X msg 123 199 add \$1; #X msg 74 269 reset; #X obj 26 219 t b; #X obj 26 322 index; #X obj 26 294 nop; #X obj 26 537 outlet; #X obj 74 221 t b; #X text 21 11 filter out duplicate names; #X text 21 37 any symbol that comes in \, gets added to a list of symbols. ; #X text 20 51 when "bang" is received \, the symbols are output as a sorted list with uniqs removed.; #X text 22 79 "reset" cleans the entire list; #X obj 26 345 route list float; #X text 403 156 part of zexy; #X obj 245 202 repack 1; #X obj 220 177 t b l b; #X obj 79 468 spigot; #X obj 26 468 spigot; #X obj 122 447 == 0; #X obj 87 427 t f f; #X obj 79 497 repack; #N canvas 0 0 653 431 LICENSE 0; #X text 195 60 forum::fuer::umlaeute; #X text 195 79 institute of electronic music and acoustics \, IEM; #X text 197 95 university of music and dramatic arts \, graz \, austria ; #X text 19 165 This program is free software \; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation \; either version 2 of the License \, or (at your option) any later version.; #X text 19 246 This program is distributed in the hope that it will be useful \, but WITHOUT ANY WARRANTY \; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.; #X text 20 326 You should have received a copy of the GNU General Public License along with this program \; if not \, write to the Free Software Foundation \, Inc. \, 51 Franklin St \, Fifth Floor \, Boston \, MA 02110-1301 USA; #X text 17 42 copyright (C) 2006 IOhannes m zmoelnig; #X text 175 118 zmoelnig iem.at; #X text 239 117 @; #X restore 405 180 pd LICENSE; #X obj 220 154 list; #X floatatom 140 431 5 0 0 0 - - -; #X obj 87 407 i \$1; #X obj 26 366 symbol; #X obj 26 387 t s b; #X obj 26 446 t s s; #X obj 26 127 route bang reset add symbol list mode; #X obj 268 152 t f; #X connect 0 0 30 0; #X connect 1 0 3 0; #X connect 2 0 7 0; #X connect 3 0 7 0; #X connect 4 0 7 0; #X connect 5 0 2 0; #X connect 6 0 14 0; #X connect 7 0 6 0; #X connect 9 0 4 0; #X connect 14 0 27 0; #X connect 14 1 22 1; #X connect 16 0 1 0; #X connect 17 0 5 0; #X connect 17 1 16 0; #X connect 17 2 4 0; #X connect 18 0 22 0; #X connect 19 0 8 0; #X connect 20 0 18 1; #X connect 21 0 19 1; #X connect 21 1 20 0; #X connect 22 0 8 0; #X connect 24 0 17 0; #X connect 26 0 21 0; #X connect 26 0 25 0; #X connect 27 0 28 0; #X connect 28 0 29 0; #X connect 28 1 26 0; #X connect 29 0 19 0; #X connect 29 1 18 0; #X connect 30 0 5 0; #X connect 30 1 9 0; #X connect 30 2 1 0; #X connect 30 3 1 0; #X connect 30 4 24 0; #X connect 30 5 31 0; #X connect 31 0 26 1; --- NEW FILE: uniqsym-help.pd --- #N canvas 145 -43 722 431 10; #X text 564 24 part of zexy; #X text 97 30 remove duplicate symbols from a list or a stream; #X obj 45 268 uniqsym; #X obj 35 29 uniqsym; #X obj 45 302 print uniq; #X msg 73 165 bang; #X msg 45 87 reset; #X text 39 69 clear the current list of values; #X text 57 110 add symbols to the list of values; #X text 76 149 remove duplicate values \, sort the entire list and output it; #X msg 56 126 symbol trigger \, symbol pang \, symbol pang; #X msg 100 188 list chitty chitty pang pang; #X msg 117 243 mode \$1; #X obj 117 223 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X text 187 244 output as list (0=default) \, or as stream of single symbols (1); #X text 529 411 updated for zexy-2.2; #X obj 44 369 uniqsym 1; #X text 131 368 you can specify the mode with a creation argument; #X connect 2 0 4 0; #X connect 5 0 2 0; #X connect 6 0 2 0; #X connect 10 0 2 0; #X connect 11 0 2 0; #X connect 12 0 2 0; #X connect 13 0 12 0;

1 0

pd/src m_sched.c,1.5.4.35.2.13,1.5.4.35.2.14
by Tim Blechmann 25 Jun '06

25 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26122/src Modified Files: Tag: devel_0_39 m_sched.c Log Message: clock fix Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.13 retrieving revision 1.5.4.35.2.14 diff -C2 -d -r1.5.4.35.2.13 -r1.5.4.35.2.14 *** m_sched.c 25 Jun 2006 17:37:42 -0000 1.5.4.35.2.13 --- m_sched.c 25 Jun 2006 17:45:20 -0000 1.5.4.35.2.14 *************** *** 377,382 **** { t_clock *c = clock_setlist; - clock_unset(c); /* the compiler should easily inline this */ sys_time = c->c_settime; outlet_setstacklim(); (*c->c_fn)(c->c_owner); --- 377,382 ---- { t_clock *c = clock_setlist; sys_time = c->c_settime; + clock_unset(c); /* the compiler should easily inline this */ outlet_setstacklim(); (*c->c_fn)(c->c_owner);

1 0

pd/src m_glob.c, 1.4.4.2.2.8, 1.4.4.2.2.9 m_sched.c, 1.5.4.35.2.12, 1.5.4.35.2.13 s_audio.c, 1.5.4.16.2.17, 1.5.4.16.2.18 s_audio_portaudio.c, 1.1.2.10, 1.1.2.11
by Tim Blechmann 25 Jun '06

25 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22533/src Modified Files: Tag: devel_0_39 m_glob.c m_sched.c s_audio.c s_audio_portaudio.c Log Message: cleaned up message-based access to portaudio backend Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.17 retrieving revision 1.5.4.16.2.18 diff -C2 -d -r1.5.4.16.2.17 -r1.5.4.16.2.18 *** s_audio.c 21 Apr 2006 14:03:17 -0000 1.5.4.16.2.17 --- s_audio.c 25 Jun 2006 17:37:42 -0000 1.5.4.16.2.18 *************** *** 212,217 **** MAXNDEV, DEVDESCSIZE); - - /* jsarlo { (*/ if (sys_externalschedlib) --- 212,215 ---- *************** *** 416,419 **** --- 414,429 ---- sys_update_sleepgrain(); + + if (enable) + { + t_atom argv[1]; + + t_symbol * selector = gensym("audio_started"); + t_symbol * pd = gensym("pd"); + + SETFLOAT(argv, 1.); + typedmess(pd->s_thing, selector, 1, argv); + } + } *************** *** 1350,1353 **** --- 1360,1364 ---- extern void pa_getaudiooutdevinfo(t_float f); extern void pa_test_setting (int ac, t_atom *av); + extern void pa_get_asio_latencies(t_float f); void glob_audio_getaudioindevinfo(t_pd * dummy, t_float f) *************** *** 1391,1394 **** --- 1402,1417 ---- } + void glob_audio_asio_latencies(t_pd * dummy, t_float f) + { + #ifdef USEAPI_PORTAUDIO + #ifndef PABLIO + if (sys_audioapi == API_PORTAUDIO) + pa_get_asio_latencies(f); + #endif + #endif + + } + + /* tb } */ Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.12 retrieving revision 1.5.4.35.2.13 diff -C2 -d -r1.5.4.35.2.12 -r1.5.4.35.2.13 *** m_sched.c 13 Jun 2006 13:05:45 -0000 1.5.4.35.2.12 --- m_sched.c 25 Jun 2006 17:37:42 -0000 1.5.4.35.2.13 *************** *** 378,381 **** --- 378,382 ---- t_clock *c = clock_setlist; clock_unset(c); /* the compiler should easily inline this */ + sys_time = c->c_settime; outlet_setstacklim(); (*c->c_fn)(c->c_owner); *************** *** 389,397 **** void sched_tick(double next_sys_time) { sys_time = next_sys_time; sched_diddsp++; /* rethink: how to get rid of this stupid histogram??? */ dsp_tick(); - run_clock_callbacks(next_sys_time); /* rethink: should we really do all this midi messaging in the realtime thread ? */ --- 390,398 ---- void sched_tick(double next_sys_time) { + run_clock_callbacks(next_sys_time); sys_time = next_sys_time; sched_diddsp++; /* rethink: how to get rid of this stupid histogram??? */ dsp_tick(); /* rethink: should we really do all this midi messaging in the realtime thread ? */ Index: s_audio_portaudio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** s_audio_portaudio.c 13 Jun 2006 12:48:01 -0000 1.1.2.10 --- s_audio_portaudio.c 25 Jun 2006 17:37:42 -0000 1.1.2.11 *************** *** 23,26 **** --- 23,27 ---- #ifdef MSW # include <malloc.h> + # include <pa_asio.h> #else # include <alloca.h> *************** *** 48,53 **** void pa_initialize() { ! if (!pa_initialized) ! { pa_status = Pa_Initialize(); if ( pa_status!= paNoError ) --- 49,54 ---- void pa_initialize() { ! // if (!pa_initialized) ! // { pa_status = Pa_Initialize(); if ( pa_status!= paNoError ) *************** *** 60,64 **** } pa_initialized = 1; ! } } --- 61,65 ---- } pa_initialized = 1; ! // } } *************** *** 177,193 **** /* set block size */ ! blocksize = sys_advance_samples; ! ! if (blocksize > 8192) ! blocksize = 8192; ! else if (blocksize < sys_dacblocksize) ! blocksize = sys_dacblocksize; ! if (blocksize != (1 << ilog2(blocksize))) ! { ! blocksize = (1 << ilog2(blocksize)); ! } ! post("using blocksize %d", blocksize); pa_blocksize = blocksize; --- 178,195 ---- /* set block size */ ! // blocksize = sys_advance_samples; ! // if (blocksize > 8192) ! // blocksize = 8192; ! // else if (blocksize < sys_dacblocksize) ! // blocksize = sys_dacblocksize; ! // if (blocksize != (1 << ilog2(blocksize))) ! // { ! // blocksize = (1 << ilog2(blocksize)); ! // } ! blocksize=64; ! ! // post("using blocksize %d", blocksize); pa_blocksize = blocksize; *************** *** 252,257 **** pa_inchans = inchans; pa_outchans = outchans; - pa_indev = indeviceno; - pa_outdev = outdeviceno; /* we might have adapted the channel count */ --- 254,257 ---- *************** *** 310,320 **** void run_all_idle_callbacks(void); - void sys_xrun_notification(void); - int process (const void *input, void *output, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void *userData) { ! static int started = 0; --- 310,318 ---- void run_all_idle_callbacks(void); int process (const void *input, void *output, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, void *userData) { ! static started = 0; *************** *** 323,332 **** if (statusFlags) ! sys_xrun_notification(); if (sys_timedlock(timeout) == ETIMEDOUT) /* we're late */ { ! sys_xrun_notification(); return 0; } --- 321,331 ---- if (statusFlags) ! post("statusFlags %p", statusFlags); if (sys_timedlock(timeout) == ETIMEDOUT) /* we're late */ { ! post("timeout %d", timeout); ! sys_log_error(ERR_SYSLOCK); return 0; } *************** *** 546,552 **** t_symbol * selector = gensym("testaudiosettingresult"); t_atom argv[1]; - int ret; - PaStreamParameters inputParameters, outputParameters; indev = pdindev2paindev(indev); outdev = pdoutdev2paoutdev(outdev); --- 545,551 ---- t_symbol * selector = gensym("testaudiosettingresult"); t_atom argv[1]; + pa_initialize(); + indev = pdindev2paindev(indev); outdev = pdoutdev2paoutdev(outdev); *************** *** 554,559 **** if ((pa_indev == -1) && (pa_outdev == -1)) { ! pa_initialize(); ! inputParameters.device = indev; inputParameters.channelCount = inchans; --- 553,559 ---- if ((pa_indev == -1) && (pa_outdev == -1)) { ! int ret; ! PaStreamParameters inputParameters, outputParameters; ! inputParameters.device = indev; inputParameters.channelCount = inchans; *************** *** 579,582 **** --- 579,584 ---- int j; int devno; + pa_initialize(); + for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) { *************** *** 587,591 **** if (devno == pdindev) { ! return devno; } devno++; --- 589,593 ---- if (devno == pdindev) { ! return j; } devno++; *************** *** 600,603 **** --- 602,607 ---- int j; int devno; + pa_initialize(); + for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) { *************** *** 608,612 **** if (devno == pdoutdev) { ! return devno; } devno++; --- 612,616 ---- if (devno == pdoutdev) { ! return j; } devno++; *************** *** 617,618 **** --- 621,652 ---- } + void pa_get_asio_latencies(t_float f) + { + int index = (int)f; + const PaDeviceInfo *pdi = Pa_GetDeviceInfo(index); + if (pdi->hostApi != paASIO) + { + post("device not an asio device"); + return; + } + #ifdef WIN32 + else + { + long minlat, maxlat, preflat, gran; + t_atom argv[4]; + + t_symbol * selector = gensym("asiolatency"); + t_symbol * pd = gensym("pd"); + + PaAsio_GetAvailableLatencyValues(index, &minlat, &maxlat, &preflat, &gran); + + SETFLOAT(argv, (float) minlat); + SETFLOAT(argv + 1, (float) maxlat); + SETFLOAT(argv + 2, (float) preflat); + SETFLOAT(argv + 3, (float) gran); + + typedmess(pd->s_thing, selector, 4, argv); + } + #endif + + } Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.4.4.2.2.8 retrieving revision 1.4.4.2.2.9 diff -C2 -d -r1.4.4.2.2.8 -r1.4.4.2.2.9 *** m_glob.c 13 Jun 2006 12:48:01 -0000 1.4.4.2.2.8 --- m_glob.c 25 Jun 2006 17:37:42 -0000 1.4.4.2.2.9 *************** *** 39,50 **** void glob_audio_getaudioindevinfo(t_pd * dummy, t_float f); void glob_audio_getaudiooutdevinfo(t_pd * dummy, t_float f); ! void glob_audio_samplerate(t_pd * dummy, t_float f); ! void glob_audio_delay(t_pd * dummy, t_float f); ! void glob_audio_dacblocksize(t_pd * dummy, t_float f); ! void glob_audio_scheduler(t_pd * dummy, t_float f); void glob_audio_device(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); ! void glob_audio_device_in(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); ! void glob_audio_device_out(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); void glob_audio_getcurrent_devices(void); /* tb } */ --- 39,51 ---- void glob_audio_getaudioindevinfo(t_pd * dummy, t_float f); void glob_audio_getaudiooutdevinfo(t_pd * dummy, t_float f); ! //void glob_audio_samplerate(t_pd * dummy, t_float f); ! //void glob_audio_delay(t_pd * dummy, t_float f); ! //void glob_audio_dacblocksize(t_pd * dummy, t_float f); ! //void glob_audio_scheduler(t_pd * dummy, t_float f); void glob_audio_device(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); ! //void glob_audio_device_in(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); ! //void glob_audio_device_out(t_pd * dummy, t_symbol *s, int argc, t_atom *argv); void glob_audio_getcurrent_devices(void); + void glob_audio_asio_latencies(t_pd * dummy, t_float f); /* tb } */ *************** *** 84,87 **** --- 85,90 ---- if (s == gensym("xrun")) return; + if (s == gensym("audio_started")) + return; startpost("%s: unknown message %s ", class_getname(pd_class(x)), *************** *** 177,194 **** gensym("tooltips"), A_DEFFLOAT, 0); /* tb: message-based audio configuration { */ ! class_addmethod(glob_pdobject, (t_method)glob_audio_samplerate, ! gensym("audio-samplerate"), A_DEFFLOAT, 0); ! class_addmethod(glob_pdobject, (t_method)glob_audio_delay, ! gensym("audio-delay"), A_DEFFLOAT, 0); ! class_addmethod(glob_pdobject, (t_method)glob_audio_dacblocksize, ! gensym("audio-dacblocksize"), A_DEFFLOAT, 0); ! class_addmethod(glob_pdobject, (t_method)glob_audio_scheduler, ! gensym("audio-scheduler"), A_DEFFLOAT, 0); class_addmethod(glob_pdobject, (t_method)glob_audio_device, gensym("audio-device"), A_GIMME, 0); ! class_addmethod(glob_pdobject, (t_method)glob_audio_device_in, ! gensym("audio-device-in"), A_GIMME, 0); ! class_addmethod(glob_pdobject, (t_method)glob_audio_device_out, ! gensym("audio-device-out"), A_GIMME, 0); class_addmethod(glob_pdobject, (t_method)glob_audio_getaudioindevices, gensym("getaudioindev"), A_GIMME, 0); --- 180,197 ---- gensym("tooltips"), A_DEFFLOAT, 0); /* tb: message-based audio configuration { */ ! // class_addmethod(glob_pdobject, (t_method)glob_audio_samplerate, ! // gensym("audio-samplerate"), A_DEFFLOAT, 0); ! // class_addmethod(glob_pdobject, (t_method)glob_audio_delay, ! // gensym("audio-delay"), A_DEFFLOAT, 0); ! // class_addmethod(glob_pdobject, (t_method)glob_audio_dacblocksize, ! // gensym("audio-dacblocksize"), A_DEFFLOAT, 0); ! // class_addmethod(glob_pdobject, (t_method)glob_audio_scheduler, ! // gensym("audio-scheduler"), A_DEFFLOAT, 0); class_addmethod(glob_pdobject, (t_method)glob_audio_device, gensym("audio-device"), A_GIMME, 0); ! // class_addmethod(glob_pdobject, (t_method)glob_audio_device_in, ! // gensym("audio-device-in"), A_GIMME, 0); ! // class_addmethod(glob_pdobject, (t_method)glob_audio_device_out, ! // gensym("audio-device-out"), A_GIMME, 0); class_addmethod(glob_pdobject, (t_method)glob_audio_getaudioindevices, gensym("getaudioindev"), A_GIMME, 0); *************** *** 203,206 **** --- 206,211 ---- class_addmethod(glob_pdobject, (t_method)glob_audio_getcurrent_devices, gensym("getaudiodevice"), 0); + class_addmethod(glob_pdobject, (t_method)glob_audio_asio_latencies, + gensym("getasiolatencies"), A_DEFFLOAT, 0); /* tb } */ #ifdef DESIRE

1 0

pd/src desire.tk,1.1.2.264,1.1.2.265
by Mathieu Bouchard 25 Jun '06

25 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28980 Modified Files: Tag: devel_0_39 desire.tk Log Message: SymbolAtom works! Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.264 retrieving revision 1.1.2.265 diff -C2 -d -r1.1.2.264 -r1.1.2.265 *** desire.tk 25 Jun 2006 11:08:57 -0000 1.1.2.264 --- desire.tk 25 Jun 2006 11:36:57 -0000 1.1.2.265 *************** *** 2692,2698 **** set classinfo(canvas) {Canvas} set classinfo(cnv) {Cnv} set classinfo(floatatom) {FloatAtom} set classinfo(symbolatom) {SymbolAtom} - # # a hack to get around the file loading process --- 2692,2698 ---- set classinfo(canvas) {Canvas} set classinfo(cnv) {Cnv} + set classinfo(text) {Comment} set classinfo(floatatom) {FloatAtom} set classinfo(symbolatom) {SymbolAtom} # # a hack to get around the file loading process *************** *** 2957,2964 **** } ! class_new comment {View} ! def comment draw {xs ys ins outs} { ! if {[llength [$canvas gettags $self]] != 0} {} ! mset {x1 y1} [$self xy] } --- 2957,2965 ---- } ! #class_new Comment {View} ! class_new Comment {Box} ! def Comment draw {} { ! super ! # should draw uh... } *************** *** 3265,3269 **** } ! class_new FloatAtom {AtomBox} def* AtomBox init {args} { --- 3266,3271 ---- } ! class_new FloatAtom {AtomBox} ! class_new SymbolAtom {AtomBox} def* AtomBox init {args} { *************** *** 3277,3293 **** set @clickpos {} set @key_input 0 - set @text 0 set @edit 0 #set @isnew 1 - } ! def* FloatAtom key {key shift} { ! global font look set @clicking 0 switch $key { Return { $@canvas focus= "" ! pd .$self set [expr $@val] pd .$self bang set @text $@val --- 3279,3306 ---- set @clickpos {} set @key_input 0 set @edit 0 #set @isnew 1 } ! def FloatAtom init {args} { ! eval [concat [list super] $args] ! set @text 0 ! } ! ! def SymbolAtom init {args} { ! eval [concat [list super] $args] ! set @text "" ! } ! ! def* AtomBox canonize {x} {return x} ! def* FloatAtom canonize {x} {return [expr $x]} ! ! def* AtomBox key {key shift} { set @clicking 0 switch $key { Return { $@canvas focus= "" ! pd .$self set [$self canonize $@val] ! pd .$self set $@val pd .$self bang set @text $@val *************** *** 3302,3320 **** $self changed } period {if {[string length $@val] < $@w} {append @val ".";set @text $@val; $self changed}} default { if {[regexp {^[0-9]{1}$} $key]} { ! if {[string length $@val] < $@w} { ! append @val $key ! set @text $@val ! $self changed } } - if {$key == "minus"} {set @val "-"; set @text $@val; $self changed} - - } } } def* FloatAtom ftoa {} { --- 3315,3350 ---- $self changed } + default {return 0} + } + return 1 + } + + def* FloatAtom key {key shift} { + global font look + if {[super $key $shift]} {return} + switch $key { period {if {[string length $@val] < $@w} {append @val ".";set @text $@val; $self changed}} + minus {set @val "-"; set @text $@val; $self changed} default { if {[regexp {^[0-9]{1}$} $key]} { ! if {[string length $@val] < $@w} { ! append @val $key ! set @text $@val ! $self changed ! } } } } } + def* SymbolAtom key {key shift} { + global font look + if {[super $key $shift]} {return} + if {[string length $@val] < $@w} { + append @val $key + set @text $@val + $self changed + } + } def* FloatAtom ftoa {} { *************** *** 3351,3355 **** } ! def* FloatAtom click {x y b f} { set c .$(a)canvas.c set @clickpos [list $x $y] --- 3381,3385 ---- } ! def* AtomBox click {x y b f} { set c .$(a)canvas.c set @clickpos [list $x $y] *************** *** 3363,3378 **** } ! def* FloatAtom unclick {x y b} { global look set @clicking 0 if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { ! $@canvas focus= $self ! set @val "" ! set @clicking 0 ! set @key_input 1 } { ! $@canvas focus= "" ! $self selected?= 0 ! if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val} } } --- 3393,3408 ---- } ! def* AtomBox unclick {x y b} { global look set @clicking 0 if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { ! $@canvas focus= $self ! set @val "" ! set @clicking 0 ! set @key_input 1 } { ! $@canvas focus= "" ! $self selected?= 0 ! if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val} } } *************** *** 3395,3416 **** } - class_new SymbolAtom {AtomBox} - - # copypaste from FloatAtom init - def* SymbolAtom init {args} { - super - global font look - eval [concat [list super] $args] - set @clicking 0 - set @val 0 - set @old_val 0 - set @valid 0 - set @clickpos {} - set @key_input 0 - set @text 0 - set @edit 0 - #set @isnew 1 - } - class_new NumBox {Labeled Box} def* NumBox init {args} { --- 3425,3428 ----

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