From 9645c9b233beb36b19bde5afe8c8d0f7eef18c47 Mon Sep 17 00:00:00 2001 From: Guenter Geiger Date: Fri, 21 Mar 2003 10:15:43 +0000 Subject: updated externals.pd svn path=/trunk/; revision=490 --- externals/build/externals.pd | 279 +++++++++++++++++++++++----------- externals/build/include/extlib_util.h | 13 ++ externals/build/include/g_canvas.h | 31 +++- externals/build/include/m_imp.h | 3 + externals/build/linux/makefile | 14 +- externals/build/src/bangfilt.c | 5 - externals/build/src/bangfilt2.c | 5 - externals/build/src/rl.c | 1 - externals/build/src/sl.c | 1 - externals/build/src/vst.c | 1 - 10 files changed, 231 insertions(+), 122 deletions(-) create mode 100644 externals/build/include/extlib_util.h delete mode 100644 externals/build/src/bangfilt.c delete mode 100644 externals/build/src/bangfilt2.c delete mode 100644 externals/build/src/rl.c delete mode 100644 externals/build/src/sl.c delete mode 100644 externals/build/src/vst.c diff --git a/externals/build/externals.pd b/externals/build/externals.pd index 3e14a87b..6e177901 100644 --- a/externals/build/externals.pd +++ b/externals/build/externals.pd @@ -1,95 +1,192 @@ -#N canvas 128 78 939 540 10; -#X obj 13 9 aenv~; -#X obj 14 36 ann; -#X obj 14 64 arraysize; -#X obj 14 92 ascseq; -#X obj 14 120 ascwave; -#X obj 14 149 atan2~; -#X obj 13 178 bandpass; -#X obj 13 207 bfilt; -#X obj 13 235 bfilt2; -#X obj 13 263 catch13~; -#X obj 724 342 cdplayer; -#X obj 14 293 counter; -#X obj 14 320 cxavgdev; -#X obj 14 347 cxmean; -#X obj 14 374 cxstddev; -#X obj 15 402 delta~; -#X obj 113 10 dist_normal; -#N canvas 648 205 450 300 gui 1; -#X obj 19 18 envgen 124 73; +#N canvas 375 0 998 732 10; +#X obj 15 32 aenv~; +#X obj 15 53 ann; +#X obj 15 113 arraysize; +#X obj 15 136 ascseq; +#X obj 15 161 ascwave; +#X obj 15 184 atan2~; +#X obj 16 237 bandpass; +#X obj 16 362 bfilt; +#X obj 16 389 bfilt2; +#X obj 18 508 catch13~; +#X obj 841 337 cdplayer; +#X obj 17 611 counter; +#X obj 17 635 cxavgdev; +#X obj 17 659 cxmean; +#X obj 17 682 cxstddev; +#X obj 115 31 delta~; +#X obj 115 101 dist_normal; +#N canvas 648 205 450 300 gui 0; +#X obj 19 18 envgen 122 105; #X obj 160 15 slider 127 0 15; #X obj 196 18 ticker; #X obj 248 22 toddle black 15 15; #X obj 198 59 button OK; -#X restore 610 18 pd gui; -#X obj 113 37 equalizer; -#X obj 114 65 filesize; -#X obj 115 91 ftos; -#X obj 114 120 henon; -#X obj 114 150 hex2dec; -#X obj 114 176 highpass; -#X obj 115 208 highshelf; -#X obj 114 236 hlshelf; -#X obj 115 264 ikeda; -#X obj 114 292 ixprint; -#X obj 114 320 kalashnikov; -#X obj 114 348 lorenz; -#X obj 115 376 lowpass; -#X obj 115 402 mandelbrot; -#X obj 115 428 mandelbrot~; -#X obj 226 12 mean~; -#X obj 225 37 mixer~; -#X obj 226 65 moog~; -#X obj 225 93 notch; -#X obj 222 121 openpatch; -#X obj 725 370 ossmixer; -#X obj 641 234 piperead~; -#X obj 554 234 pipewrite~; -#X obj 222 144 prepend; -#X obj 223 174 proc; -#X obj 223 201 promiscous~; -#X obj 225 229 qread; -#X obj 225 255 random1; -#X obj 223 283 random_fl; -#X obj 223 309 random_icg; -#X obj 224 334 random_tw; -#X obj 317 13 receive13~; -#X obj 319 39 receive13; -#X obj 319 68 reson~; -#X obj 587 90 rl; -#X obj 319 95 rossler; -#X obj 320 123 rtin~; -#X obj 321 152 scramble~; -#X obj 323 184 send13~; -#X obj 324 208 send13; -#X obj 614 393 serial_bird; -#X obj 613 420 serial_ms; -#X obj 613 368 serialctl; -#X obj 322 233 serialize; -#X obj 612 343 sfread~; -#X obj 322 260 sfwrite~; -#X obj 732 211 sfwrite13~; -#X obj 614 444 shell; -#X obj 419 39 sinh; -#X obj 552 89 sl; -#X obj 419 66 sprinkler; -#X obj 421 96 state; -#X obj 553 209 streamin13~; -#X obj 555 185 streamin~; -#X obj 640 210 streamout13~; -#X obj 639 186 streamout~; -#X obj 421 124 stripdir; -#X obj 422 152 strippath; -#X obj 421 180 susloop~; -#X obj 423 207 svf~; -#X obj 423 235 throw13~; -#X obj 422 264 unserialize; -#X obj 423 290 utime; -#X obj 425 317 vbap; -#X obj 425 343 wavinfo; -#X obj 426 372 zhzxh~; -#X text 550 319 Linux only:; -#X text 550 65 obsolete ?; -#X text 621 86 use \$0 instead; -#X text 553 159 merging needed:; +#X restore 727 13 pd gui; +#X obj 117 343 equalizer; +#X obj 120 469 filesize; +#X obj 122 495 ftos; +#X obj 120 587 henon; +#X obj 119 610 hex2dec; +#X obj 119 631 highpass; +#X obj 120 654 highshelf; +#X obj 120 703 hlshelf; +#X obj 221 34 ikeda; +#X obj 227 295 lorenz; +#X obj 227 320 lowpass; +#X obj 228 366 mandelbrot; +#X obj 228 392 mandelbrot~; +#X obj 229 462 mean~; +#X obj 228 487 mixer~; +#X obj 229 534 moog~; +#X obj 322 106 openpatch; +#X obj 842 365 ossmixer; +#X obj 758 229 piperead~; +#X obj 671 229 pipewrite~; +#X obj 328 302 prepend; +#X obj 328 325 proc; +#X obj 678 636 promiscous~; +#X obj 329 420 qread; +#X obj 331 470 random1; +#X obj 331 493 random_fl; +#X obj 330 517 random_icg; +#X obj 330 540 random_tw; +#X obj 330 608 receive13~; +#X obj 330 585 receive13; +#X obj 332 654 reson~; +#X obj 452 23 rossler; +#X obj 453 45 rtin~; +#X obj 455 108 scramble~; +#X obj 459 153 send13~; +#X obj 456 131 send13; +#X obj 731 388 serial_bird; +#X obj 730 415 serial_ms; +#X obj 730 363 serialctl; +#X obj 453 183 serialize; +#X obj 729 338 sfread~; +#X obj 849 183 sfwrite~; +#X obj 849 206 sfwrite13~; +#X obj 731 439 shell; +#X obj 453 213 sinh; +#X obj 455 285 sprinkler; +#X obj 455 311 state; +#X obj 670 204 streamin13~; +#X obj 672 180 streamin~; +#X obj 757 205 streamout13~; +#X obj 756 181 streamout~; +#X obj 457 387 stripdir; +#X obj 458 412 strippath; +#X obj 458 457 susloop~; +#X obj 458 480 svf~; +#X obj 458 507 throw13~; +#X obj 555 45 unserialize; +#X obj 557 92 utime; +#X obj 558 114 vbap; +#X obj 558 158 wavinfo; +#X obj 559 258 zhzxh~; +#X text 667 314 Linux only:; +#X text 670 154 merging needed:; +#X obj 15 10 abs~; +#X obj 15 74 ann_som; +#X text 679 513 defunkt:; +#X obj 15 210 average; +#X obj 15 261 bdiag~; +#X obj 16 287 beat; +#X obj 17 312 beta; +#X obj 17 335 bfft~; +#X obj 16 415 bilex; +#X obj 676 563 binshift; +#X obj 17 461 borax; +#X obj 18 485 bwin~; +#X obj 17 534 cauchy; +#X obj 17 561 cheby~; +#X obj 17 586 chord; +#X obj 114 9 delta; +#X obj 116 54 diag~; +#X obj 116 77 dist; +#X obj 116 125 dist~; +#X obj 116 151 divide; +#X obj 115 176 divmod; +#X obj 116 199 dwt~; +#X obj 116 222 dynwav~; +#X obj 116 246 eadsr~; +#X obj 117 270 ead~; +#X obj 117 294 ear~; +#X obj 118 318 edge; +#X obj 118 368 expo; +#X obj 119 394 fdn~; +#X obj 119 420 ffpoly; +#X obj 120 446 fifo; +#X obj 121 519 fwarp; +#X obj 120 680 history; +#X obj 121 541 gauss; +#X obj 121 563 gestalt; +#X obj 221 12 ignore; +#X obj 222 57 inv; +#X obj 223 80 iso; +#X obj 224 102 ixprint; +#X obj 223 125 junction~; +#X obj 224 149 kalashnikov; +#X obj 225 173 lattice~; +#X obj 226 196 lifo; +#X obj 225 221 limit; +#X obj 226 246 linear; +#X obj 226 270 listfunnel; +#X obj 228 343 lowshelf; +#X obj 229 414 match; +#X obj 229 438 matrix~; +#X obj 227 510 mlife; +#X obj 228 557 multi; +#X obj 227 582 netclient; +#X obj 225 606 netdist; +#X obj 225 630 netrec; +#X obj 225 653 netserver; +#X obj 224 677 notch; +#X obj 224 701 nroute; +#X obj 323 18 oggamp~; +#X obj 733 538 oggcast~; +#X obj 675 609 oggread~; +#X obj 675 586 oggwrite~; +#X obj 322 128 permut~; +#X obj 324 152 piperead~; +#X obj 325 176 pipewrite~; +#X obj 326 199 pitch; +#X obj 749 566 plugin~; +#X obj 327 228 plus; +#X obj 327 252 poisson; +#X obj 328 276 pong; +#X obj 686 660 proxy; +#X obj 328 350 pulse; +#X obj 329 375 qmult~; +#X obj 328 398 qnorm~; +#X obj 330 445 ramp~; +#X obj 684 683 randomix; +#X obj 331 563 ratio; +#X obj 330 631 remote; +#X obj 751 589 reson; +#X obj 333 676 rewrap; +#X obj 335 701 rhythm; +#X obj 759 684 rhythm_ioi_histogram; +#X obj 768 659 rhythm_quantum; +#X obj 770 636 rhythm_slave_metro; +#X obj 455 69 scale; +#X obj 815 596 score; +#X obj 823 544 sigdelta; +#X obj 455 261 split; +#X obj 455 236 speedlim; +#X obj 456 335 statwav~; +#X obj 456 360 step; +#X obj 458 435 subst; +#X obj 459 532 tabreadmix~; +#X obj 459 554 temperature; +#X obj 460 576 throw13~; +#X obj 461 598 tilt; +#X obj 461 622 timebang; +#X obj 462 646 triang; +#X obj 554 22 unroute; +#X obj 557 69 urn; +#X obj 558 136 velocity; +#X obj 558 183 weibull; +#X obj 559 207 wrap; +#X obj 561 232 xfm~; +#X obj 678 538 arbran; diff --git a/externals/build/include/extlib_util.h b/externals/build/include/extlib_util.h new file mode 100644 index 00000000..8ab253f4 --- /dev/null +++ b/externals/build/include/extlib_util.h @@ -0,0 +1,13 @@ +#include "../../creb/include/extlib_util.h" + +float milliseconds_2_one_minus_realpole(float time) +{ + float r; + + if (time < 0.0f) time = 0.0f; + r = -expm1(1000.0f * log(ENVELOPE_RANGE) / (sys_getsr() * time)); + if (!(r < 1.0f)) r = 1.0f; + + return r; +} + diff --git a/externals/build/include/g_canvas.h b/externals/build/include/g_canvas.h index fb567ea5..e4eecfc0 100644 --- a/externals/build/include/g_canvas.h +++ b/externals/build/include/g_canvas.h @@ -66,9 +66,6 @@ EXTERN_STRUCT _tscalar; EXTERN_STRUCT _canvasenvironment; #define t_canvasenvironment struct _canvasenvironment -EXTERN_STRUCT _linetraverser; -#define t_linetraverser struct _linetraverser - typedef struct _selection { t_gobj *sel_what; @@ -92,9 +89,15 @@ typedef struct _editor struct _glist *e_glist; /* glist which owns this */ int e_xwas; /* xpos on last mousedown or motion event */ int e_ywas; /* ypos, similarly */ + int e_selectline_index1; /* indices for the selected line if any */ + int e_selectline_outno; /* (only valid if e_selectedline is set) */ + int e_selectline_index2; + int e_selectline_inno; + t_outconnect *e_selectline_tag; unsigned int e_onmotion: 3; /* action to take on motion */ unsigned int e_lastmoved: 1; /* one if mouse has moved since click */ unsigned int e_textdirty: 1; /* one if e_textedfor has changed */ + unsigned int e_selectedline: 1; /* one if a line is selected */ } t_editor; #define MA_NONE 0 /* e_onmotion: do nothing on mouse motion */ @@ -166,7 +169,6 @@ struct _glist unsigned int gl_edit:1; /* edit mode */ unsigned int gl_imatemplate:1; /* someone needs me as template */ unsigned int gl_isdeleting:1; /* we're inside glist_delete -- hack! */ - unsigned int gl_protect:1; /* don't delete connections on click */ unsigned int gl_stretch:1; /* stretch contents on resize */ unsigned int gl_isgraph:1; /* show as graph on parent */ }; @@ -209,7 +211,7 @@ struct _array }; /* structure for traversing all the connections in a glist */ -struct _linetraverser +typedef struct _linetraverser { t_canvas *tr_x; t_object *tr_ob; @@ -225,7 +227,7 @@ struct _linetraverser int tr_lx1, tr_ly1, tr_lx2, tr_ly2; t_outconnect *tr_nextoc; int tr_nextoutno; -}; +} t_linetraverser; /* function types used to define graphical behavior for gobjs, a bit like X widgets. We don't use Pd methods because Pd's typechecking can't specify the @@ -388,6 +390,9 @@ EXTERN void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, char *tag, int x1, int y1, int x2, int y2); EXTERN void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag); EXTERN void canvas_create_editor(t_glist *x, int createit); +void canvas_deletelinesforio(t_canvas *x, t_text *text, + t_inlet *inp, t_outlet *outp); + /* -------------------- functions on texts ------------------------- */ EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); @@ -470,6 +475,16 @@ EXTERN int canvas_hitbox(t_canvas *x, t_gobj *y, int xpos, int ypos, int *x1p, int *y1p, int *x2p, int *y2p); EXTERN int canvas_setdeleting(t_canvas *x, int flag); +typedef void (*t_undofn)(t_canvas *canvas, void *buf, + int action); /* a function that does UNDO/REDO */ +#define UNDO_FREE 0 /* free current undo/redo buffer */ +#define UNDO_UNDO 1 /* undo */ +#define UNDO_REDO 2 /* redo */ +EXTERN void canvas_setundo(t_canvas *x, t_undofn undofn, void *buf, + const char *name); +EXTERN void canvas_noundo(t_canvas *x); +EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); + /* ---- functions on canvasses as objects --------------------- */ EXTERN void canvas_fattenforscalars(t_canvas *x, @@ -562,3 +577,7 @@ EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, /* ----------------------- guiconnects, g_guiconnect.c --------- */ EXTERN t_guiconnect *guiconnect_new(t_pd *who, t_symbol *sym); EXTERN void guiconnect_notarget(t_guiconnect *x, double timedelay); + +/* ------------- IEMGUI routines used in other g_ files ---------------- */ +EXTERN t_symbol *iemgui_raute2dollar(t_symbol *s); +EXTERN t_symbol *iemgui_dollar2raute(t_symbol *s); diff --git a/externals/build/include/m_imp.h b/externals/build/include/m_imp.h index 05e20c0b..e6ad155f 100644 --- a/externals/build/include/m_imp.h +++ b/externals/build/include/m_imp.h @@ -72,6 +72,8 @@ extern char *sys_guicmd; /* in s_main.c */ EXTERN int sys_nearestfontsize(int fontsize); EXTERN int sys_hostfontsize(int fontsize); +extern char sys_cordcolor[]; +extern int sys_guishadow; extern int sys_defaultfont; extern t_symbol *sys_libdir; /* library directory for auxilliary files */ @@ -90,6 +92,7 @@ and MIDI I/O as follows: */ #define SENDDACS_YES 1 #define SENDDACS_SLEPT 2 +#define API_PROBE -1 #define API_OSS 0 /* API choices */ #define API_ALSA 1 #define API_RME 2 diff --git a/externals/build/linux/makefile b/externals/build/linux/makefile index 68a2666d..b2765e36 100644 --- a/externals/build/linux/makefile +++ b/externals/build/linux/makefile @@ -1,9 +1,9 @@ prefix=$(DESTDIR)/usr -EXTERNALS = $(shell ls ) +EXTERNALS = $(shell ls ../src ) -all: link.stamp $(EXTERNALS:.c=.pd_linux) +all: $(EXTERNALS:.c=.pd_linux) .SUFFIXES: .pd_linux @@ -34,13 +34,3 @@ install: install-doc install -m644 *.pd_linux $(prefix)/lib/pd/extra -link: link.stamp - -link.stamp: - cp ../src/*.c . - rm vst.c - touch link.stamp - make - - - diff --git a/externals/build/src/bangfilt.c b/externals/build/src/bangfilt.c deleted file mode 100644 index 12aef32e..00000000 --- a/externals/build/src/bangfilt.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "../cxc/bangfilt.c" -void bangfilt_setup() -{ - bfilt_setup(); -} diff --git a/externals/build/src/bangfilt2.c b/externals/build/src/bangfilt2.c deleted file mode 100644 index 3d5a8659..00000000 --- a/externals/build/src/bangfilt2.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "../cxc/bangfilt2.c" -void bangfilt2_setup() -{ - bfilt2_setup(); -} diff --git a/externals/build/src/rl.c b/externals/build/src/rl.c deleted file mode 100644 index 9d3761bd..00000000 --- a/externals/build/src/rl.c +++ /dev/null @@ -1 +0,0 @@ -#include "../ggee/control/rl.c" diff --git a/externals/build/src/sl.c b/externals/build/src/sl.c deleted file mode 100644 index 96485167..00000000 --- a/externals/build/src/sl.c +++ /dev/null @@ -1 +0,0 @@ -#include "../ggee/control/sl.c" diff --git a/externals/build/src/vst.c b/externals/build/src/vst.c deleted file mode 100644 index 9ed93995..00000000 --- a/externals/build/src/vst.c +++ /dev/null @@ -1 +0,0 @@ -#include "../vst/vst.c" -- cgit v1.2.1