diff options
| -rw-r--r-- | externals/grill/dyn/dyn.dsp | 107 | ||||
| -rw-r--r-- | externals/grill/dyn/makefile.pd-darwin | 2 | ||||
| -rw-r--r-- | externals/grill/dyn/pd/dyn~.pd | 274 | ||||
| -rw-r--r-- | externals/grill/dyn/readme.txt | 4 | ||||
| -rw-r--r-- | externals/grill/dyn/src/main.cpp | 4 |
5 files changed, 141 insertions, 250 deletions
diff --git a/externals/grill/dyn/dyn.dsp b/externals/grill/dyn/dyn.dsp deleted file mode 100644 index 5814d4e8..00000000 --- a/externals/grill/dyn/dyn.dsp +++ /dev/null @@ -1,107 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dyn" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=dyn - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl -!MESSAGE -!MESSAGE NMAKE /f "dyn.mak". -!MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: -!MESSAGE -!MESSAGE NMAKE /f "dyn.mak" CFG="dyn - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "dyn - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "dyn - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "dyn" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dyn - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "pd-msvc/r" -# PROP Intermediate_Dir "pd-msvc/r" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DYN_EXPORTS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "f:\prog\pd\pd-cvs\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PD" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc07 /d "NDEBUG" -# ADD RSC /l 0xc07 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib pthreadVC.lib /nologo /dll /machine:I386 /out:"pd-msvc/dyn~.dll" /libpath:"f:\prog\pd\pd-cvs/bin" /libpath:"..\flext\pd-msvc" - -!ELSEIF "$(CFG)" == "dyn - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "pd-msvc/d" -# PROP Intermediate_Dir "pd-msvc/d" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DYN_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "c:\programme\audio\pd-0.37\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PD" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0xc07 /d "_DEBUG" -# ADD RSC /l 0xc07 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib pd.lib flext_d-pdwin.lib pthreadVC.lib /nologo /dll /debug /machine:I386 /out:"pd-msvc/d/dyn~.dll" /pdbtype:sept /libpath:"c:\programme\audio\pd-0.37/bin" /libpath:"..\flext\pd-msvc" - -!ENDIF - -# Begin Target - -# Name "dyn - Win32 Release" -# Name "dyn - Win32 Debug" -# Begin Group "doc" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=".\make-files.txt" -# End Source File -# Begin Source File - -SOURCE=.\readme.txt -# End Source File -# End Group -# Begin Source File - -SOURCE=.\src\main.cpp -# End Source File -# End Target -# End Project diff --git a/externals/grill/dyn/makefile.pd-darwin b/externals/grill/dyn/makefile.pd-darwin index 2fc40958..2294d4a5 100644 --- a/externals/grill/dyn/makefile.pd-darwin +++ b/externals/grill/dyn/makefile.pd-darwin @@ -22,7 +22,7 @@ FLEXTLIB=$(FLEXTPATH)/flext.a INCLUDES=$(PDPATH) LIBPATH= FLAGS=-DFLEXT_SYS=2 ${U_FLAGS} -CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-rtti +CFLAGS=-O2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-rtti #CFLAGS=-g LIBS=m FRAMEWORKS=vecLib diff --git a/externals/grill/dyn/pd/dyn~.pd b/externals/grill/dyn/pd/dyn~.pd index f34cc218..8ec75d9c 100644 --- a/externals/grill/dyn/pd/dyn~.pd +++ b/externals/grill/dyn/pd/dyn~.pd @@ -1,137 +1,137 @@ -#N canvas 195 68 753 579 12;
-#N canvas 41 57 572 671 examples 0;
-#X floatatom 153 276 5 0 0 0 - - -;
-#X floatatom 110 353 5 0 0 0 - - -;
-#X floatatom 111 576 5 0 0 0 - - -;
-#X obj 220 316 +;
-#X floatatom 221 351 5 0 0 0 - - -;
-#X floatatom 153 498 5 0 0 0 - - -;
-#X floatatom 210 498 5 0 0 0 - - -;
-#X floatatom 263 498 5 0 0 0 - - -;
-#X obj 227 542 * 2;
-#X obj 260 545 + 1;
-#X floatatom 236 573 5 0 0 0 - - -;
-#X floatatom 225 276 5 0 0 0 - - -;
-#X floatatom 201 73 5 0 0 0 - - -;
-#X floatatom 100 155 5 0 0 0 - - -;
-#X floatatom 216 153 5 0 0 0 - - -;
-#X obj 215 118 f;
-#X obj 101 117 dyn~ 0 1 0 1;
-#X obj 111 315 dyn~ 0 2 0 1;
-#X obj 111 543 dyn~ 0 3 0 1;
-#X msg 36 34 reset \, newobj . a f \, conn 0 a 0 \, conn a 0 0;
-#X msg 42 234 reset \, newobj . a + \, conn 0 a 0 \, conn 1 a 1 \,
-conn a 0 0;
-#X msg 35 443 reset \, newobj . a * 2 \, newobj . b + 1 \, conn 0 a
-0 \, conn 1 a 1 \, conn a 0 b 0 \, conn 2 b 1 \, conn b 0 0;
-#X connect 0 0 3 0;
-#X connect 0 0 17 1;
-#X connect 3 0 4 0;
-#X connect 5 0 8 0;
-#X connect 5 0 18 1;
-#X connect 6 0 8 1;
-#X connect 6 0 18 2;
-#X connect 7 0 9 1;
-#X connect 7 0 18 3;
-#X connect 8 0 9 0;
-#X connect 9 0 10 0;
-#X connect 11 0 3 1;
-#X connect 11 0 17 2;
-#X connect 12 0 15 0;
-#X connect 12 0 16 1;
-#X connect 15 0 14 0;
-#X connect 16 0 13 0;
-#X connect 17 0 1 0;
-#X connect 18 0 2 0;
-#X connect 19 0 16 0;
-#X connect 20 0 17 0;
-#X connect 21 0 18 0;
-#X restore 514 459 pd examples;
-#X msg 127 70 reset;
-#X text 184 70 clear all objects and connections;
-#X msg 129 231 conn 0 a 0;
-#X text 224 230 connect dyn-inlet 0 to a-inlet 0;
-#X msg 129 260 conn a 0 0;
-#X text 224 259 connect a-outlet 0 to dyn-outlet 0;
-#X msg 129 293 conn x 2 y 3;
-#X text 234 292 connect x-outlet 2 to y-inlet 3;
-#X msg 129 356 del a;
-#X text 181 358 delete object "a";
-#X obj 11 10 cnv 15 600 40 empty empty dyn~ 10 22 0 24 -260818 -1 0
-;
-#X text 133 32 http://www.parasitaere-kapazitaeten.net;
-#X text 133 12 dynamic object management \, (C)2003 Thomas Grill;
-#X msg 128 387 send a message 1;
-#X text 270 387 send "message 1" to a-inlet 0;
-#X obj 54 468 dyn~ 0 1 0 2;
-#X text 156 467 dyn sig/msg inlets sig/msg outlets;
-#X msg 165 421 vis \$1;
-#X obj 129 421 tgl 20 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0
-1;
-#X text 222 417 make patch visible/invisible;
-#X msg 129 323 dis x 2 y 3;
-#X text 234 324 disconnect x-outlet 2 to y-inlet 3;
-#X text 187 98 reload all objects (keep connections);
-#X msg 127 98 reload;
-#X text 218 432 (connections are not drawn at the moment!);
-#N canvas 178 192 570 426 dsp-ex 0;
-#X obj 73 380 dac~;
-#X obj 144 258 hsl 128 15 0 1000 0 0 empty empty empty -2 -6 0 8 -261681
--1 -1 2800 1;
-#X obj 155 283 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0
-10 -262144 -1 -1 220.472 256;
-#X msg 66 78 reset;
-#X obj 482 19 loadbang;
-#X msg 481 43 \; pd dsp 1;
-#X text 65 56 clear all;
-#X obj 47 278 dyn~ 0 1 2 0;
-#X text 70 107 make an oscillator (left);
-#X text 66 167 add an oscillator (double frq \, right);
-#X text 24 17 signals passing through dyn~ are delayed by one block
-;
-#X text 74 239 select frequency;
-#X obj 57 341 *~ 0.2;
-#X obj 112 341 *~ 0.2;
-#X obj 140 314 hsl 128 15 0.001 1 1 0 empty empty empty -2 -6 0 8 -262131
--1 -1 9100 1;
-#X text 277 310 gain;
-#X msg 64 129 newobj . o1 osc~ 220 \, conn 0 o1 0 \, conn o1 0 0;
-#X msg 67 187 newobj . m * 1.5 \, newobj . o2 osc~ 330 \, conn 0 m
-0 \, conn m 0 o2 0 \, conn o2 0 1;
-#X connect 1 0 2 0;
-#X connect 1 0 7 1;
-#X connect 3 0 7 0;
-#X connect 4 0 5 0;
-#X connect 7 0 12 0;
-#X connect 7 1 13 0;
-#X connect 12 0 0 0;
-#X connect 13 0 0 1;
-#X connect 14 0 12 1;
-#X connect 14 0 13 1;
-#X connect 16 0 7 0;
-#X connect 17 0 7 0;
-#X restore 514 487 pd dsp-ex;
-#X msg 129 156 newmsg . b Hello;
-#X msg 128 124 newobj . a + 1;
-#X text 247 124 make new object [+ 1] with name "a" in root patcher
-(".");
-#X text 269 156 make new message object [Hello( with name "b" in root
-patcher;
-#X msg 128 200 newobj . c pd sub;
-#X text 273 200 make sub patcher;
-#X msg 425 198 newobj c d bang;
-#X text 561 198 make object in sub patcher;
-#X connect 1 0 16 0;
-#X connect 3 0 16 0;
-#X connect 5 0 16 0;
-#X connect 7 0 16 0;
-#X connect 9 0 16 0;
-#X connect 14 0 16 0;
-#X connect 18 0 16 0;
-#X connect 19 0 18 0;
-#X connect 21 0 16 0;
-#X connect 24 0 16 0;
-#X connect 27 0 16 0;
-#X connect 28 0 16 0;
-#X connect 31 0 16 0;
-#X connect 33 0 16 0;
+#N canvas 351 22 757 583 12; +#N canvas 41 57 576 675 examples 0; +#X floatatom 153 276 5 0 0 0 - - -; +#X floatatom 110 353 5 0 0 0 - - -; +#X floatatom 111 576 5 0 0 0 - - -; +#X obj 256 315 +; +#X floatatom 257 350 5 0 0 0 - - -; +#X floatatom 153 498 5 0 0 0 - - -; +#X floatatom 242 499 5 0 0 0 - - -; +#X floatatom 304 497 5 0 0 0 - - -; +#X obj 259 543 * 2; +#X obj 301 544 + 1; +#X floatatom 268 574 5 0 0 0 - - -; +#X floatatom 261 275 5 0 0 0 - - -; +#X floatatom 224 72 5 0 0 0 - - -; +#X floatatom 100 155 5 0 0 0 - - -; +#X floatatom 239 152 5 0 0 0 - - -; +#X obj 238 117 f; +#X obj 101 117 dyn~ 0 1 0 1; +#X obj 111 315 dyn~ 0 2 0 1; +#X obj 111 543 dyn~ 0 3 0 1; +#X msg 36 34 reset \, newobj . a f \, conn 0 a 0 \, conn a 0 0; +#X msg 42 234 reset \, newobj . a + \, conn 0 a 0 \, conn 1 a 1 \, +conn a 0 0; +#X msg 35 443 reset \, newobj . a * 2 \, newobj . b + 1 \, conn 0 a +0 \, conn 1 a 1 \, conn a 0 b 0 \, conn 2 b 1 \, conn b 0 0; +#X connect 0 0 3 0; +#X connect 0 0 17 1; +#X connect 3 0 4 0; +#X connect 5 0 8 0; +#X connect 5 0 18 1; +#X connect 6 0 8 1; +#X connect 6 0 18 2; +#X connect 7 0 9 1; +#X connect 7 0 18 3; +#X connect 8 0 9 0; +#X connect 9 0 10 0; +#X connect 11 0 3 1; +#X connect 11 0 17 2; +#X connect 12 0 15 0; +#X connect 12 0 16 1; +#X connect 15 0 14 0; +#X connect 16 0 13 0; +#X connect 17 0 1 0; +#X connect 18 0 2 0; +#X connect 19 0 16 0; +#X connect 20 0 17 0; +#X connect 21 0 18 0; +#X restore 514 459 pd examples; +#X msg 127 70 reset; +#X text 184 70 clear all objects and connections; +#X msg 129 231 conn 0 a 0; +#X text 224 230 connect dyn-inlet 0 to a-inlet 0; +#X msg 129 260 conn a 0 0; +#X text 224 259 connect a-outlet 0 to dyn-outlet 0; +#X msg 129 293 conn x 2 y 3; +#X text 234 292 connect x-outlet 2 to y-inlet 3; +#X msg 129 356 del a; +#X text 181 358 delete object "a"; +#X obj 11 10 cnv 15 600 40 empty empty dyn~ 10 22 0 24 -260818 -1 0 +; +#X text 133 32 http://www.parasitaere-kapazitaeten.net; +#X text 133 12 dynamic object management \, (C)2003 Thomas Grill; +#X msg 128 387 send a message 1; +#X text 270 387 send "message 1" to a-inlet 0; +#X obj 54 468 dyn~ 0 1 0 2; +#X text 156 467 dyn sig/msg inlets sig/msg outlets; +#X msg 165 421 vis \$1; +#X obj 129 421 tgl 20 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +1; +#X text 222 417 make patch visible/invisible; +#X msg 129 323 dis x 2 y 3; +#X text 234 324 disconnect x-outlet 2 to y-inlet 3; +#X text 187 98 reload all objects (keep connections); +#X msg 127 98 reload; +#X text 218 432 (connections are not drawn at the moment!); +#N canvas 178 192 574 430 dsp-ex 0; +#X obj 73 380 dac~; +#X obj 183 257 hsl 128 15 0 1000 0 0 empty empty empty -2 -6 0 8 -261681 +-1 -1 5200 1; +#X obj 194 282 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 +-262144 -1 -1 409.449 256; +#X msg 66 78 reset; +#X obj 467 323 loadbang; +#X msg 466 347 \; pd dsp 1; +#X text 65 56 clear all; +#X obj 47 278 dyn~ 0 1 2 0; +#X text 70 107 make an oscillator (left); +#X text 66 167 add an oscillator (double frq \, right); +#X text 24 17 signals passing through dyn~ are delayed by one block +; +#X text 74 239 select frequency; +#X obj 57 341 *~ 0.2; +#X obj 141 340 *~ 0.2; +#X obj 179 313 hsl 128 15 0.001 1 1 0 empty empty empty -2 -6 0 8 -262131 +-1 -1 8800 1; +#X text 316 309 gain; +#X msg 64 129 newobj . o1 osc~ 220 \, conn 0 o1 0 \, conn o1 0 0; +#X msg 67 187 newobj . m * 1.5 \, newobj . o2 osc~ 330 \, conn 0 m +0 \, conn m 0 o2 0 \, conn o2 0 1; +#X connect 1 0 2 0; +#X connect 1 0 7 1; +#X connect 3 0 7 0; +#X connect 4 0 5 0; +#X connect 7 0 12 0; +#X connect 7 1 13 0; +#X connect 12 0 0 0; +#X connect 13 0 0 1; +#X connect 14 0 12 1; +#X connect 14 0 13 1; +#X connect 16 0 7 0; +#X connect 17 0 7 0; +#X restore 514 487 pd dsp-ex; +#X msg 129 156 newmsg . b Hello; +#X msg 128 124 newobj . a + 1; +#X text 247 124 make new object [+ 1] with name "a" in root patcher +("."); +#X text 269 156 make new message object [Hello( with name "b" in root +patcher; +#X msg 128 200 newobj . c pd sub; +#X text 273 200 make sub patcher; +#X msg 425 198 newobj c d bang; +#X text 561 198 make object in sub patcher; +#X connect 1 0 16 0; +#X connect 3 0 16 0; +#X connect 5 0 16 0; +#X connect 7 0 16 0; +#X connect 9 0 16 0; +#X connect 14 0 16 0; +#X connect 18 0 16 0; +#X connect 19 0 18 0; +#X connect 21 0 16 0; +#X connect 24 0 16 0; +#X connect 27 0 16 0; +#X connect 28 0 16 0; +#X connect 31 0 16 0; +#X connect 33 0 16 0; diff --git a/externals/grill/dyn/readme.txt b/externals/grill/dyn/readme.txt index 09b7c45f..99dd5efd 100644 --- a/externals/grill/dyn/readme.txt +++ b/externals/grill/dyn/readme.txt @@ -16,19 +16,17 @@ The package should at least compile (and is tested) with the following compilers pd - Windows: ------------- -o Microsoft Visual C++ 6: edit "config-pd-msvc.txt" & run "build-pd-msvc.bat" +o Microsoft Visual C++: edit "config-pd-msvc.txt" & run "build-pd-msvc.bat" pd - linux: ----------- o GCC: edit "config-pd-linux.txt" & run "sh build-pd-linux.sh" - additional settings (e.g. target processor, compiler flags) can be made in makefile.pd-linux pd - MacOSX: ----------- o GCC: edit "config-pd-darwin.txt" & run "sh build-pd-darwin.sh" - additional settings (e.g. target processor, compiler flags) can be made in makefile.pd-darwin ---------------------------------------------------------------------------- diff --git a/externals/grill/dyn/src/main.cpp b/externals/grill/dyn/src/main.cpp index 6b5e962c..38897c5d 100644 --- a/externals/grill/dyn/src/main.cpp +++ b/externals/grill/dyn/src/main.cpp @@ -13,8 +13,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include <flext.h> -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 402) -#error You need at least flext version 0.4.2 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 405) +#error You need at least flext version 0.4.5 #endif #define DYN_VERSION "0.1.0" |