From 9303c7e113a5527d58b814c7bb11db5dbdfba5a4 Mon Sep 17 00:00:00 2001 From: Miller Puckette Date: Sat, 20 Jan 2007 04:06:07 +0000 Subject: improve error reporting for lists to inlets, and replace __BYTE_ORDER by BYTE_ORDER to fix compile failure on Mac. svn path=/trunk/; revision=7367 --- pd/doc/3.audio.examples/C08.analog.sequencer.pd | 56 ++++++++++++------------- pd/portaudio/pa_win_wdmks/pa_win_wdmks.c | 2 +- pd/portaudio/pablio/ringbuffer.c | 2 +- pd/portaudio/pablio/ringbuffer.h | 2 +- pd/portmidi/pm_mac/pmmacosxcm.c | 2 +- pd/src/d_array.c | 4 +- pd/src/d_osc.c | 4 +- pd/src/m_obj.c | 5 ++- pd/src/m_pd.h | 2 +- pd/src/notes.txt | 11 +++-- pd/src/s_main.c | 1 - 11 files changed, 49 insertions(+), 42 deletions(-) (limited to 'pd') diff --git a/pd/doc/3.audio.examples/C08.analog.sequencer.pd b/pd/doc/3.audio.examples/C08.analog.sequencer.pd index 9ee9e6de..bbde61cc 100644 --- a/pd/doc/3.audio.examples/C08.analog.sequencer.pd +++ b/pd/doc/3.audio.examples/C08.analog.sequencer.pd @@ -1,29 +1,29 @@ -#N canvas 46 22 825 554 12; -#N canvas 0 0 450 300 graph1 0; -#X array 29-sequence 9 float 1; -#A 0 55 550 385 495 165 385 495 275 615; -#X coords 0 500 8 0 200 100 1; +#N canvas 57 74 829 559 12; +#N canvas 0 0 450 300 (subpatch) 0; +#X array 29-sequence 9 float 3; +#A 0 110 550 385 495 165 385 495 275 615; +#X coords 0 500 9 0 200 100 1; #X restore 621 42 graph; #X obj 27 426 *~; #X obj 27 454 hip~ 5; -#N canvas 0 0 450 300 graph1 0; +#N canvas 0 0 450 300 (subpatch) 0; #X array 29-envelope 103 float 1; -#A 0 -0.1 0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 1.01111 1 0.988889 0.977778 -0.966667 0.955556 0.944444 0.933333 0.922222 0.911111 0.9 0.888889 -0.797778 0.737777 0.677777 0.647777 0.617777 0.557777 0.487777 0.467777 -0.447776 0.417776 0.397776 0.387776 0.377776 0.367776 0.347776 0.327776 -0.317776 0.297776 0.277776 0.267776 0.257776 0.257776 0.277776 0.297776 -0.327776 0.357776 0.377776 0.397776 0.407776 0.427776 0.437776 0.387776 -0.367776 0.347776 0.337776 0.287776 0.277776 0.277776 0.277776 0.267776 -0.267776 0.267776 0.297776 0.317776 0.347776 0.367776 0.367776 0.357776 -0.347776 0.337776 0.307776 0.287776 0.257776 0.227776 0.197776 0.167776 -0.167776 0.167776 0.167776 0.167776 0.157776 0.157776 0.157776 0.157776 -0.147776 0.147776 0.147776 0.137776 0.137776 0.111111 0.1 0.0888889 -0.0777778 0.0666667 0.0555556 0.0444444 0.0333333 0.0222222 0.0111111 -0 -0.0111111; +#A 0 -0.0199988 1.0673e-06 0.0500008 0.13 0.16 0.28 0.5 0.6 0.7 0.8 +1.01111 1 0.988889 0.977778 0.966667 0.955556 0.944444 0.933333 0.922222 +0.911111 0.9 0.888889 0.797778 0.737777 0.677777 0.647777 0.617777 +0.557777 0.487777 0.467777 0.447776 0.417776 0.397776 0.387776 0.377776 +0.367776 0.347776 0.327776 0.317776 0.297776 0.277776 0.267776 0.257776 +0.257776 0.277776 0.297776 0.327776 0.357776 0.377776 0.397776 0.407776 +0.427776 0.437776 0.387776 0.367776 0.347776 0.337776 0.287776 0.277776 +0.277776 0.277776 0.267776 0.267776 0.267776 0.297776 0.317776 0.347776 +0.367776 0.367776 0.357776 0.347776 0.337776 0.307776 0.287776 0.257776 +0.227776 0.197776 0.167776 0.167776 0.167776 0.167776 0.167776 0.157776 +0.157776 0.157776 0.157776 0.147776 0.147776 0.147776 0.137776 0.137776 +0.111111 0.1 0.0888889 0.0777778 0.0666667 0.0555556 0.0444444 0.0333333 +0.0222222 0.0111111 0 -0.0111111; #X coords 0 1 102 0 200 100 1; #X restore 622 146 graph; -#N canvas 0 0 450 300 graph1 0; +#N canvas 0 0 450 300 (subpatch) 0; #X array 29-sample 259 float 1; #A 0 0.989177 1 0.989177 0.95694 0.903989 0.83147 0.740952 0.634394 0.514103 0.382684 0.242981 0.0980184 -0.0490663 -0.195089 -0.336888 @@ -117,14 +117,6 @@ then went in and changed it with the mouse afterward.); #X restore 689 401 pd make-tables; #X text 46 1 ANALOG-SYNTH-STYLE SEQUENCER; #X obj 26 170 phasor~ 0.6; -#X text 27 27 Some control operations can be carried out entirely by -tilde objects passing audio signals around. Here is an imitation of -an analog sequencer and envelope generator. A phasor~ loops through -the "sequence" table at 0.6 Hz \, generating 9 frequencies. Simultaneously -\, by multiplying by 9 and wrapping \, we create a sawtooth at 9*0.6=5.4 -Hz \, which reads a second table for an envelope shape. This becomes -the grain size for a samplerbased on the 18.sampler.looped example -earlier.; #X text 97 194 main loop: sawtooth of amplitude 9; #X text 218 219 read frequency sequence; #X text 162 241 9x original frequency sawtooth; @@ -134,6 +126,14 @@ earlier.; #X text 147 361 adjust amplitude and center for wavetable; #X text 62 428 multiply by raised-cosine smoothing function; #X text 478 401 how to make the tables:; +#X text 27 27 Some control operations can be carried out entirely by +tilde objects passing audio signals around. Here is an imitation of +an analog sequencer and envelope generator. A phasor~ loops through +the "sequence" table at 0.6 Hz \, generating 9 frequencies. Simultaneously +\, by multiplying by 9 and wrapping \, we create a sawtooth at 9*0.6=5.4 +Hz \, which reads a second table for an envelope shape. This becomes +the grain size for a sampler based on the 18.sampler.looped example +earlier.; #X connect 1 0 2 0; #X connect 2 0 14 0; #X connect 2 0 14 1; diff --git a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c index ca385eab..560858b6 100644 --- a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c +++ b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c @@ -1,5 +1,5 @@ /* - * $Id: pa_win_wdmks.c,v 1.17 2006-12-07 16:19:05 millerpuckette Exp $ + * $Id: pa_win_wdmks.c,v 1.18 2007-01-20 04:06:06 millerpuckette Exp $ * PortAudio Windows WDM-KS interface * * Author: Andrew Baldwin diff --git a/pd/portaudio/pablio/ringbuffer.c b/pd/portaudio/pablio/ringbuffer.c index 96c2158d..a9c331c4 100644 --- a/pd/portaudio/pablio/ringbuffer.c +++ b/pd/portaudio/pablio/ringbuffer.c @@ -1,5 +1,5 @@ /* - * $Id: ringbuffer.c,v 1.16 2006-12-07 16:19:05 millerpuckette Exp $ + * $Id: ringbuffer.c,v 1.17 2007-01-20 04:06:06 millerpuckette Exp $ * ringbuffer.c * Ring Buffer utility.. * diff --git a/pd/portaudio/pablio/ringbuffer.h b/pd/portaudio/pablio/ringbuffer.h index cc7db0ad..26bbd125 100644 --- a/pd/portaudio/pablio/ringbuffer.h +++ b/pd/portaudio/pablio/ringbuffer.h @@ -6,7 +6,7 @@ extern "C" #endif /* __cplusplus */ /* - * $Id: ringbuffer.h,v 1.17 2006-12-07 16:19:05 millerpuckette Exp $ + * $Id: ringbuffer.h,v 1.18 2007-01-20 04:06:06 millerpuckette Exp $ * ringbuffer.h * Ring Buffer utility.. * diff --git a/pd/portmidi/pm_mac/pmmacosxcm.c b/pd/portmidi/pm_mac/pmmacosxcm.c index a27b915a..a2d0cc43 100644 --- a/pd/portmidi/pm_mac/pmmacosxcm.c +++ b/pd/portmidi/pm_mac/pmmacosxcm.c @@ -5,7 +5,7 @@ * and subsequent work by Andrew Zeldis and Zico Kolter * and Roger B. Dannenberg * - * $Id: pmmacosxcm.c,v 1.17 2006-12-07 16:19:05 millerpuckette Exp $ + * $Id: pmmacosxcm.c,v 1.18 2007-01-20 04:06:06 millerpuckette Exp $ */ /* Notes: diff --git a/pd/src/d_array.c b/pd/src/d_array.c index e8c034fe..d78c26ae 100644 --- a/pd/src/d_array.c +++ b/pd/src/d_array.c @@ -521,11 +521,11 @@ static void tabread4_tilde_setup(void) #endif #if defined(__unix__) || defined(__APPLE__) -#if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) +#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) #error No byte order defined #endif -#if __BYTE_ORDER == __LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN #define HIOFFSET 1 #define LOWOFFSET 0 #else diff --git a/pd/src/d_osc.c b/pd/src/d_osc.c index 0f2eb3e9..b0becdba 100644 --- a/pd/src/d_osc.c +++ b/pd/src/d_osc.c @@ -35,11 +35,11 @@ #endif #if defined(__unix__) || defined(__APPLE__) -#if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) +#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) #error No byte order defined #endif -#if __BYTE_ORDER == __LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN #define HIOFFSET 1 #define LOWOFFSET 0 #else diff --git a/pd/src/m_obj.c b/pd/src/m_obj.c index ff2ff249..f5c91cdf 100644 --- a/pd/src/m_obj.c +++ b/pd/src/m_obj.c @@ -250,14 +250,17 @@ void obj_init(void) pointerinlet_class = class_new(gensym("inlet"), 0, 0, sizeof(t_inlet), CLASS_PD, 0); class_addpointer(pointerinlet_class, pointerinlet_pointer); - + class_addanything(pointerinlet_class, inlet_wrong); + floatinlet_class = class_new(gensym("inlet"), 0, 0, sizeof(t_inlet), CLASS_PD, 0); class_addfloat(floatinlet_class, (t_method)floatinlet_float); + class_addanything(floatinlet_class, inlet_wrong); symbolinlet_class = class_new(gensym("inlet"), 0, 0, sizeof(t_inlet), CLASS_PD, 0); class_addsymbol(symbolinlet_class, symbolinlet_symbol); + class_addanything(symbolinlet_class, inlet_wrong); } diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h index 19795414..d3a1a9d8 100644 --- a/pd/src/m_pd.h +++ b/pd/src/m_pd.h @@ -11,7 +11,7 @@ extern "C" { #define PD_MAJOR_VERSION 0 #define PD_MINOR_VERSION 41 #define PD_BUGFIX_VERSION 0 -#define PD_TEST_VERSION "test03" +#define PD_TEST_VERSION "test04" /* old name for "MSW" flag -- we have to take it for the sake of many old "nmakefiles" for externs, which will define NT and not MSW */ diff --git a/pd/src/notes.txt b/pd/src/notes.txt index 1aa5f8c5..266b2939 100644 --- a/pd/src/notes.txt +++ b/pd/src/notes.txt @@ -1,6 +1,4 @@ ---------------- dolist -------------------- -0.40-1: - help browser broke on Panurge binbuf_read_via_canvas in x_qlist.c PC device counting problem (first device invoked by -audiodev 0) @@ -19,7 +17,10 @@ turn on paMacCore_ChangeDeviceParameters for mac (pa_mac_core.h) Gnome: why don't windows pop up when clicked on? problems: -help browser (offer both versions?) +TK menu on Windows says "wish" +activating windows in Gnome? +help browser broke on Panurge +offer both new and old help browser style look again at array vis/invis conundrum, g_template.c TK commands to nonexistent windows? (occasionally still happens) still can't detect when a window is moved or resized @@ -47,8 +48,12 @@ detect adc~ and dac~ reblocking more demonstration patches: vibrato using variable delay real-time spectrum grapher +document ||, |, etc, better features: +messages to suppress menus&accelerators, and invisibilize Pd window +machine-independent fonts +callback scheduling on Mac sigmund~: sort by pitch; one-shot add -x flag to drawnumbers.... grab new ALSA midi code from devel diff --git a/pd/src/s_main.c b/pd/src/s_main.c index a7156c20..ebaa661b 100644 --- a/pd/src/s_main.c +++ b/pd/src/s_main.c @@ -47,7 +47,6 @@ int sys_guisetportnumber; /* if started from the GUI, this is the port # */ char *sys_guicmd; t_symbol *sys_libdir; static t_symbol *sys_guidir; -t_namelist *sys_externlist; static t_namelist *sys_openlist; static t_namelist *sys_messagelist; static int sys_version; -- cgit v1.2.1