diff options
28 files changed, 181 insertions, 245 deletions
diff --git a/externals/grill/flext/readme.txt b/externals/grill/flext/readme.txt index 7696ef6f..9eac2a1b 100644 --- a/externals/grill/flext/readme.txt +++ b/externals/grill/flext/readme.txt @@ -115,6 +115,10 @@ see flext.h, fldefs.h and flclass.h for the documented base definitions and clas Version history: +0.4.2: +- moved CLASS_MAINSIGNALIN to class scope (fixed "float method overwritten" warning) +- unix makefiles: CXX should be commented out if standard (to enable environmental settings) + 0.4.1: - full port for Max@OSX - completely redesigned message and attribute handling: now hashed and much more efficient diff --git a/externals/grill/flext/source/flbase.cpp b/externals/grill/flext/source/flbase.cpp index f9aaffca..516be430 100644 --- a/externals/grill/flext/source/flbase.cpp +++ b/externals/grill/flext/source/flbase.cpp @@ -62,7 +62,7 @@ bool flext_obj::Init() { return true; } bool flext_obj::Finalize() { return true; } void flext_obj::Exit() {} -void flext_obj::DefineHelp(t_class *c,const char *ref,const char *dir,bool addtilde) +void flext_obj::DefineHelp(t_classid c,const char *ref,const char *dir,bool addtilde) { #if FLEXT_SYS == FLEXT_SYS_PD char tmp[256]; @@ -74,7 +74,7 @@ void flext_obj::DefineHelp(t_class *c,const char *ref,const char *dir,bool addti } else strcpy(tmp,ref); - ::class_sethelpsymbol(c,gensym(const_cast<char *>(tmp))); + ::class_sethelpsymbol(getClass(c),gensym(const_cast<char *>(tmp))); #else // no solution for Max/MSP yet #endif diff --git a/externals/grill/flext/source/flbase.h b/externals/grill/flext/source/flbase.h index 78e4818c..ea682077 100644 --- a/externals/grill/flext/source/flbase.h +++ b/externals/grill/flext/source/flbase.h @@ -180,10 +180,10 @@ class FLEXT_SHARE flext_obj: /*! Define the help reference symbol for a class \internal */ - static void DefineHelp(t_class *c,const char *ref,const char *dir = NULL,bool addtilde = false); + static void DefineHelp(t_classid c,const char *ref,const char *dir = NULL,bool addtilde = false); //! Define the help reference symbol for a class - void DefineHelp(const char *ref,const char *dir = NULL,bool addtilde = false) { DefineHelp(thisClass(),ref,dir,addtilde); } + void DefineHelp(const char *ref,const char *dir = NULL,bool addtilde = false) { DefineHelp(thisClassId(),ref,dir,addtilde); } //! @} diff --git a/externals/grill/flext/source/fldsp.cpp b/externals/grill/flext/source/fldsp.cpp index 03492ce0..7f845074 100644 --- a/externals/grill/flext/source/fldsp.cpp +++ b/externals/grill/flext/source/fldsp.cpp @@ -29,6 +29,10 @@ void flext_dsp::Setup(t_classid id) dsp_initboxclass(); #endif +#if FLEXT_SYS == FLEXT_SYS_PD + CLASS_MAINSIGNALIN(c,flext_hdr,defsig); +#endif + add_dsp(c,cb_dsp); #if FLEXT_SYS != FLEXT_SYS_MAX add_method1(c,cb_enable,"enable",A_FLOAT); diff --git a/externals/grill/flext/source/flext.h b/externals/grill/flext/source/flext.h index 8f1a71ce..b62b583e 100644 --- a/externals/grill/flext/source/flext.h +++ b/externals/grill/flext/source/flext.h @@ -23,10 +23,10 @@ WARRANTIES, see the file, "license.txt," in this distribution. */ //! \brief flext version number -#define FLEXT_VERSION 401 +#define FLEXT_VERSION 402 //! \brief flext version string -#define FLEXT_VERSTR "0.4.1" +#define FLEXT_VERSTR "0.4.2pre" //! @} diff --git a/externals/grill/flext/source/fllib.cpp b/externals/grill/flext/source/fllib.cpp index cd0c65d9..2d3aaa4c 100755 --- a/externals/grill/flext/source/fllib.cpp +++ b/externals/grill/flext/source/fllib.cpp @@ -270,8 +270,16 @@ void flext_obj::obj_add(bool lib,bool dsp,bool attr,const char *idname,const cha va_end(marker); } + // get unique class id +#if FLEXT_SYS == FLEXT_SYS_PD + t_classid clid = lo->clss; +#else + // in Max/MSP the t_class *value can't be used because it's possible that's it's not yet set!! + t_classid clid = lo; +#endif + // make help reference - flext_obj::DefineHelp(lo->clss,idname,extract(names,-1),dsp); + flext_obj::DefineHelp(clid,idname,extract(names,-1),dsp); for(int ix = 0; ; ++ix) { // in this loop register all the possible aliases of the object @@ -296,14 +304,6 @@ void flext_obj::obj_add(bool lib,bool dsp,bool attr,const char *idname,const cha #endif } - // get unique class id -#if FLEXT_SYS == FLEXT_SYS_PD - t_classid clid = lo->clss; -#else - // in Max/MSP the t_class *value can't be used because it's possible that's it's not yet set!! - t_classid clid = lo; -#endif - // call class setup function setupfun(clid); } diff --git a/externals/grill/flext/source/flout.cpp b/externals/grill/flext/source/flout.cpp index 382c7e39..f8fb1fe1 100644 --- a/externals/grill/flext/source/flout.cpp +++ b/externals/grill/flext/source/flout.cpp @@ -79,7 +79,6 @@ bool flext_base::InitInlets() if(incnt >= 1) { switch(list[0]) { case xlet::tp_sig: - CLASS_MAINSIGNALIN(thisClass(),flext_hdr,defsig); ++insigs; break; default: diff --git a/externals/grill/xsample/build-pd-linux.sh b/externals/grill/xsample/build-pd-linux.sh new file mode 100755 index 00000000..77c6e3ff --- /dev/null +++ b/externals/grill/xsample/build-pd-linux.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +SYS=pd-linux + +. config-${SYS}.txt + +make -f makefile.${SYS} && +{ + if [ $INSTDIR != "" ]; then + echo Now install as root + su -c "make -f makefile.${SYS} install" + fi + if [ $HELPDIR != "" ]; then + echo Now install help as root + su -c "make -f makefile.${SYS} install-help" + fi +} diff --git a/externals/grill/xsample/config-pd-darwin.txt b/externals/grill/xsample/config-pd-darwin.txt index 8344a8d3..005a3975 100755 --- a/externals/grill/xsample/config-pd-darwin.txt +++ b/externals/grill/xsample/config-pd-darwin.txt @@ -2,8 +2,8 @@ # Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) # -# your c++ compiler (normally g++) -CXX=g++ +# your c++ compiler (if not g++) +# CXX=g++ # where does the PD installation reside? PD=/usr/local/pd @@ -19,7 +19,7 @@ PDBIN=${PD}/bin/pd # where do the flext libraries reside? FLEXTPATH=${PD}/flext -# where should flext libraries be built? +# where should the xsample objects be built? TARGDIR=./pd-darwin # where should xsample be installed? diff --git a/externals/grill/xsample/config-pd-linux.txt b/externals/grill/xsample/config-pd-linux.txt new file mode 100755 index 00000000..26e62e49 --- /dev/null +++ b/externals/grill/xsample/config-pd-linux.txt @@ -0,0 +1,28 @@ +# xsample - extended sample objects for Max/MSP and pd (pure data) +# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) +# + +# your c++ compiler (if not g++) +# CXX=g++ + +# where does the PD installation reside? +PD=/usr/local/lib/pd + +# where are the PD header files? +# leave it blank if it is a system directory (like /usr/local/include), +# since gcc 3.2 complains about it +PDINC= + +# where do the flext libraries reside? +FLEXTPATH=${PD}/flext + +# where should xsample objects be built? +TARGDIR=./pd-linux + +# where should xsample be installed? +# (leave blank to omit installation) +INSTDIR=${PD}/extra + +# where should the xsample help be installed? +# (leave blank to omit installation) +HELPDIR=${PD}/doc/5.reference diff --git a/externals/grill/xsample/license.txt b/externals/grill/xsample/license.txt index dc45deed..01baf51a 100644 --- a/externals/grill/xsample/license.txt +++ b/externals/grill/xsample/license.txt @@ -1,5 +1,5 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (C) 2001,2002 Thomas Grill +Copyright (C) 2001-2003 Thomas Grill This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -30,7 +30,7 @@ See the license texts below: --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals -Copyright (C) 2001,2002 Thomas Grill +Copyright (C) 2001-2003 Thomas Grill This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/externals/grill/xsample/makefile.pd-darwin b/externals/grill/xsample/makefile.pd-darwin index 0573cb4d..0dbb0611 100755 --- a/externals/grill/xsample/makefile.pd-darwin +++ b/externals/grill/xsample/makefile.pd-darwin @@ -1,5 +1,5 @@ # xsample - extended sample objects for Max/MSP and pd (pure data) -# Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) # # Makefile for gcc @ OSX (darwin) # @@ -13,11 +13,11 @@ CONFIG=config-pd-darwin.txt include ${CONFIG} -FLEXTLIB=$(FLEXTPATH)/flext_t.a +FLEXTLIB=$(FLEXTPATH)/flext.a # compiler stuff INCLUDES=$(PDINC) -FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS +FLAGS=-DFLEXT_SYS=2 CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes # -maltivec LIBS=m LDFLAGS=-bundle -bundle_loader $(PDBIN) @@ -42,7 +42,7 @@ $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) touch $(patsubst %,$(SRCDIR)/%,$(SRCS)) $(TARGDIR): - mkdir $(TARGDIR) + -mkdir $(TARGDIR) $(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ @@ -53,7 +53,7 @@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) $(INSTDIR): - mkdir $(INSTDIR) + -mkdir $(INSTDIR) install:: $(INSTDIR) @@ -63,7 +63,7 @@ install:: $(TARGET) $(HELPDIR): - mkdir $(HELPDIR) + -mkdir $(HELPDIR) install-help:: $(HELPDIR) diff --git a/externals/grill/xsample/source/makefile.pd-linux b/externals/grill/xsample/makefile.pd-linux index 2dba8cec..9e6dabaf 100644 --- a/externals/grill/xsample/source/makefile.pd-linux +++ b/externals/grill/xsample/makefile.pd-linux @@ -1,5 +1,5 @@ # xsample - extended sample objects for Max/MSP and pd (pure data) -# Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) # # Makefile for gcc @ linux # @@ -8,30 +8,17 @@ # to install (as root), do "make -f makefile.pd-linux install" # -## EDIT ZONE ################################## +CONFIG=config-pd-linux.txt -# flext path -FLEXTPATH=/usr/local/lib/pd/flext - -# pd path -#PDPATH=/usr/local/lib/pd/include - -# where to install -INSTDIR=/usr/local/lib/pd/extra - -############################################### +include ${CONFIG} FLEXTLIB=$(FLEXTPATH)/flext.a -# where to build (temporary) -TARGDIR=../pd-linux - # compiler stuff -CXX=g++-3.2 -INCLUDES=$(PDPATH) -FLAGS=-DPD -#CFLAGS=-O6 -mcpu=pentiumpro -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions -CFLAGS=-O6 -mcpu=pentium3 -msse -mfpmath=sse -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions +INCLUDES=$(PDINC) +FLAGS=-DFLEXT_SYS=2 +CFLAGS=-O6 -mcpu=pentiumpro -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions +#CFLAGS=-O6 -mcpu=pentium3 -msse -mfpmath=sse -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions LIBS=m # ---------------------------------------------- @@ -39,10 +26,9 @@ LIBS=m # ---------------------------------------------- NAME=xsample +SRCDIR=source -# all the source files from the package -SRCS=main.cpp inter.cpp play.cpp record.cpp groove.cpp -HDRS=main.h +include make-files.txt MAKEFILE=makefile.pd-linux TARGET=$(TARGDIR)/$(NAME).pd_linux @@ -50,13 +36,13 @@ TARGET=$(TARGDIR)/$(NAME).pd_linux # default target all: $(TARGDIR) $(TARGET) -$(SRCS): $(HDRS) $(MAKEFILE) - touch $@ +$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG) + touch $(patsubst %,$(SRCDIR)/%,$(SRCS)) $(TARGDIR): - mkdir $(TARGDIR) + -mkdir $(TARGDIR) -$(TARGDIR)/%.o : %.cpp +$(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) @@ -65,7 +51,7 @@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) chmod 755 $@ $(INSTDIR): - mkdir $(INSTDIR) + -mkdir $(INSTDIR) install:: $(INSTDIR) @@ -73,6 +59,16 @@ install:: $(TARGET) cp $^ $(INSTDIR) chown root.root $(patsubst %,$(INSTDIR)/%,$(notdir $^)) +$(HELPDIR): + -mkdir $(HELPDIR) + +install-help:: $(HELPDIR) + +install-help:: ./pd + chmod 644 $^/*.* + cp $^/*.* $(HELPDIR) + + .PHONY: clean clean: rm -f $(TARGDIR)/*.o $(TARGET) diff --git a/externals/grill/xsample/pd/ramp.pd b/externals/grill/xsample/pd/ramp.pd new file mode 100644 index 00000000..c83678ac --- /dev/null +++ b/externals/grill/xsample/pd/ramp.pd @@ -0,0 +1,29 @@ +#N canvas 79 120 562 484 12;
+#X obj 85 248 line~;
+#X obj 88 124 delay \$1;
+#X obj 85 177 pack 1 \$1;
+#X obj 84 307 outlet~;
+#X obj 139 61 route pos;
+#X obj 88 98 t b b f;
+#X obj 207 307 outlet;
+#X msg 186 268 pos \$1;
+#X obj 186 241 f;
+#X obj 139 31 inlet;
+#X obj 18 35 loadbang;
+#X obj 17 69 1;
+#X obj 120 151 pack 0 \$1;
+#X connect 0 0 3 0;
+#X connect 1 0 2 0;
+#X connect 1 0 8 0;
+#X connect 2 0 0 0;
+#X connect 4 0 5 0;
+#X connect 4 1 6 0;
+#X connect 5 0 1 0;
+#X connect 5 1 12 0;
+#X connect 5 2 8 1;
+#X connect 7 0 6 0;
+#X connect 8 0 7 0;
+#X connect 9 0 4 0;
+#X connect 10 0 11 0;
+#X connect 11 0 0 0;
+#X connect 12 0 0 0;
diff --git a/externals/grill/xsample/pd/xgroove~.help.pd b/externals/grill/xsample/pd/xgroove~.pd index da24d9ec..da24d9ec 100644 --- a/externals/grill/xsample/pd/xgroove~.help.pd +++ b/externals/grill/xsample/pd/xgroove~.pd diff --git a/externals/grill/xsample/pd/xplay~.help.pd b/externals/grill/xsample/pd/xplay~.pd index 5bf89020..5bf89020 100644 --- a/externals/grill/xsample/pd/xplay~.help.pd +++ b/externals/grill/xsample/pd/xplay~.pd diff --git a/externals/grill/xsample/pd/xrecord~.help.pd b/externals/grill/xsample/pd/xrecord~.pd index 80c09f65..80c09f65 100644 --- a/externals/grill/xsample/pd/xrecord~.help.pd +++ b/externals/grill/xsample/pd/xrecord~.pd diff --git a/externals/grill/xsample/readme.txt b/externals/grill/xsample/readme.txt index a5599f5b..3beb2776 100644 --- a/externals/grill/xsample/readme.txt +++ b/externals/grill/xsample/readme.txt @@ -1,6 +1,6 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -78,6 +78,8 @@ Version history: - xgroove~: introduced a crossfading loop zone - adapted source for flext 0.4.1 - most methods within class scope - introduced attributes +- restructured make procedures +- corrected names of PD makefile, set help names 0.2.4: - according to flext 0.2.3 changed sample type to t_sample (S) diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp index 306c660b..64729b88 100644 --- a/externals/grill/xsample/source/groove.cpp +++ b/externals/grill/xsample/source/groove.cpp @@ -2,7 +2,7 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -83,7 +83,7 @@ protected: V mg_pos(F &v) const { v = curpos*s2u; } private: - static V setup(t_class *c); + static V setup(t_classid c); virtual V s_dsp(); @@ -126,8 +126,10 @@ private: FLEXT_LIB_DSP_V("xgroove~",xgroove) -V xgroove::setup(t_class *c) +V xgroove::setup(t_classid c) { + DefineHelp(c,"xgroove~"); + FLEXT_CADDMETHOD_(c,0,"all",m_all); FLEXT_CADDMETHOD(c,1,m_min); FLEXT_CADDMETHOD(c,2,m_max); diff --git a/externals/grill/xsample/source/inter.ci b/externals/grill/xsample/source/inter.ci index 2902c386..e7f37439 100644 --- a/externals/grill/xsample/source/inter.ci +++ b/externals/grill/xsample/source/inter.ci @@ -1,3 +1,13 @@ +/* + +xsample - extended sample objects for Max/MSP and pd (pure data) + +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) +For information on usage and redistribution, and for a DISCLAIMER OF ALL +WARRANTIES, see the file, "license.txt," in this distribution. + +*/ + #ifndef __INTER_H #define __INTER_H diff --git a/externals/grill/xsample/source/inter.cpp b/externals/grill/xsample/source/inter.cpp index c88ceedb..aeee7e9d 100644 --- a/externals/grill/xsample/source/inter.cpp +++ b/externals/grill/xsample/source/inter.cpp @@ -2,7 +2,7 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/xsample/source/main.cpp b/externals/grill/xsample/source/main.cpp index 4097ed98..2a39950d 100644 --- a/externals/grill/xsample/source/main.cpp +++ b/externals/grill/xsample/source/main.cpp @@ -2,7 +2,7 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -14,7 +14,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. // Initialization function for xsample library V lib_setup() { - post("xsample objects, version " XSAMPLE_VERSION ", (C)2001,2002 Thomas Grill"); + post("xsample objects, version " XSAMPLE_VERSION ", (C)2001-2003 Thomas Grill"); post("xsample: xrecord~, xplay~, xgroove~ - send objects a 'help' message to get assistance"); post(""); @@ -36,7 +36,7 @@ FLEXT_LIB_SETUP(xsample,lib_setup) // ------------------------------ -void xsample::setup(t_class *c) +void xsample::setup(t_classid c) { FLEXT_CADDBANG(c,0,m_start); FLEXT_CADDMETHOD_(c,0,"start",m_start); diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h index dfc8147c..77d02772 100644 --- a/externals/grill/xsample/source/main.h +++ b/externals/grill/xsample/source/main.h @@ -2,7 +2,7 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -11,7 +11,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #ifndef __XSAMPLE_H #define __XSAMPLE_H -#define XSAMPLE_VERSION "0.2.5pre2" +#define XSAMPLE_VERSION "0.2.5pre3" #define FLEXT_ATTRIBUTES 1 @@ -126,7 +126,7 @@ protected: V mg_max(F &v) const { v = curmax*s2u; } private: - static V setup(t_class *c); + static V setup(t_classid c); FLEXT_CALLBACK(m_start) FLEXT_CALLBACK(m_stop) diff --git a/externals/grill/xsample/source/makefile.bcc b/externals/grill/xsample/source/makefile.bcc deleted file mode 100644 index e9e624b2..00000000 --- a/externals/grill/xsample/source/makefile.bcc +++ /dev/null @@ -1,74 +0,0 @@ -# xsample - extended sample objects for Max/MSP and pd (pure data) -# Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) -# -# Makefile for BorlandC++ -# -# usage: make -f makefile.bcc -# -# --------------------------------------------- - -NAME=xsample -SETUPFUNCTION=$(NAME)_setup - -# where to put the build -OUTPATH=..\bcc - -# flext stuff -FLEXTPATH=..\..\flext ### EDIT! ## -TARGET=pdwin - -# paths -BCCPATH=c:\programme\prog\bcc55 ### EDIT! ## -PDPATH=c:\programme\audio\pd ### EDIT! ## - -# includes, libs -INCPATH=-I$(BCCPATH)\include -I$(PDPATH)\src -I$(FLEXTPATH)\source -LIBPATH=-L$(BCCPATH)\lib -L$(PDPATH)\lib -LIBS=cw32.lib import32.lib C0D32.OBJ - -# compiler definitions and flags -DEFS=-DPD -DNT -CFLAGS=-6 -O2 -OS -ff -tWD - - -# the rest can stay untouched -# ---------------------------------------------- - -# all the source files from the package -SRCS= main.cpp inter.cpp record.cpp play.cpp groove.cpp -HDRS= main.h inter.ci - -OBJS= $(SRCS:.cpp=.obj) - -# default target -all: $(OUTPATH)\$(NAME).dll - -# remove build -clean: - -del /s /q $(OUTPATH) > nul - rmdir $(OUTPATH) - -# ---------------------------------------------- - -$(SRCS): $(HDRS) - -touch $< - -.PATH.OBJ=$(OUTPATH) - -.cpp.obj: - bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $< - -$(OUTPATH): - -@if not exist $< mkdir $< - -$(OUTPATH)\pd.lib: $(PDPATH)\bin\pd.dll - implib -a $@ $** - -$(OUTPATH)\$(NAME).def: - @echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $< - -$(OUTPATH)\$(NAME).dll :: $(OUTPATH) $(OUTPATH)\$(NAME).def $(OUTPATH)\pd.lib - -$(OUTPATH)\$(NAME).dll :: $(OBJS) - ilink32 -C -Tpd $(LIBPATH) $** ,$<,,$(LIBS) $(OUTPATH)\pd.lib $(FLEXTPATH)\pd-bcc\flext-$(TARGET).lib,$(OUTPATH)\$(NAME).def - diff --git a/externals/grill/xsample/source/makefile.pd-cygwin b/externals/grill/xsample/source/makefile.pd-cygwin deleted file mode 100644 index 18c53431..00000000 --- a/externals/grill/xsample/source/makefile.pd-cygwin +++ /dev/null @@ -1,89 +0,0 @@ -# xsample - extended sample objects for Max/MSP and pd (pure data) -# Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) -# -# Makefile for gcc @ linux -# -# usage: -# to build run "make -f makefile.pd-cygwin" -# to install (as root), do "make -f makefile.pd-cygwin install" -# - -## EDIT ZONE ################################## - -# flext path -FLEXTPATH=../../flext - -# pd path -PDPATH=c:/programme/audio/pd - -# where to install -INSTDIR=c:/programme/audio/pd/extra - -############################################### - -FLEXTLIB=$(FLEXTPATH)/pd-cygwin/flext.lib - -# where to build (temporary) -TARGDIR=../pd-cygwin - -# compiler stuff -INCLUDES=$(PDPATH)/src -LIBPATH=$(PDPATH)/bin -FLAGS=-DPD -CFLAGS=-O6 -mcpu=pentiumpro -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions -LIBS=m pd - -# ---------------------------------------------- -# the rest can stay untouched -# ---------------------------------------------- - -NAME=xsample - -# all the source files from the package -SRCS=main.cpp inter.cpp play.cpp record.cpp groove.cpp -HDRS=main.h - -MAKEFILE=makefile.pd-cygwin -TARGET=$(TARGDIR)/$(NAME).dll - -# default target -all: $(TARGDIR) $(TARGET) - -$(SRCS): $(HDRS) $(MAKEFILE) - touch $@ - -$(TARGDIR): - mkdir $(TARGDIR) - -$(TARGDIR)/%.o : %.cpp - $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ - -$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) - $(CXX) $(LDFLAGS) -shared $(patsubst %,-L%,$(LIBPATH)) $^ $(patsubst %,-l%,$(LIBS)) -o $@ - strip --strip-unneeded $@ - chmod 755 $@ - -$(INSTDIR): - mkdir $(INSTDIR) - -install:: $(INSTDIR) - -install:: $(TARGET) - cp $^ $(INSTDIR) - chown root.root $(patsubst %,$(INSTDIR)/%,$(notdir $^)) - -.PHONY: clean -clean: - rm -f $(TARGDIR)/*.o $(TARGET) - - - - - - - - - - - - diff --git a/externals/grill/xsample/source/play.cpp b/externals/grill/xsample/source/play.cpp index 770dd6b6..f558e95d 100644 --- a/externals/grill/xsample/source/play.cpp +++ b/externals/grill/xsample/source/play.cpp @@ -2,7 +2,7 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -19,7 +19,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. class xplay: public xinter { - FLEXT_HEADER(xplay,xinter) + FLEXT_HEADER_S(xplay,xinter,setup) public: xplay(I argc,const t_atom *argv); @@ -30,6 +30,8 @@ public: virtual V m_print(); private: + static V setup(t_classid c); + virtual V m_signal(I n,S *const *in,S *const *out) { bufchk(); @@ -39,6 +41,10 @@ private: FLEXT_LIB_DSP_V("xplay~",xplay) +V xplay::setup(t_classid c) +{ + DefineHelp(c,"xplay~"); +} xplay::xplay(I argc,const t_atom *argv) { diff --git a/externals/grill/xsample/source/record.cpp b/externals/grill/xsample/source/record.cpp index 36d6549a..d138d4e5 100644 --- a/externals/grill/xsample/source/record.cpp +++ b/externals/grill/xsample/source/record.cpp @@ -2,7 +2,7 @@ xsample - extended sample objects for Max/MSP and pd (pure data) -Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -63,7 +63,7 @@ protected: V outputmax() { ToOutFloat(outmax,curmax*s2u); } private: - static V setup(t_class *c); + static V setup(t_classid c); virtual V s_dsp(); @@ -94,8 +94,10 @@ private: FLEXT_LIB_DSP_V("xrecord~",xrecord) -V xrecord::setup(t_class *c) +V xrecord::setup(t_classid c) { + DefineHelp(c,"xrecord~"); + FLEXT_CADDMETHOD_F(c,0,"pos",m_pos); FLEXT_CADDMETHOD_F(c,0,"min",m_min); FLEXT_CADDMETHOD_F(c,0,"max",m_max); diff --git a/externals/grill/xsample/source/xsample.dsp b/externals/grill/xsample/xsample.dsp index 838d709d..735b77c5 100644 --- a/externals/grill/xsample/source/xsample.dsp +++ b/externals/grill/xsample/xsample.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 /nologo /dll /machine:I386 /libpath:"c:\programme\audio\pd\bin" /libpath:"..\..\flext\pd-msvc\\" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /libpath:"c:\programme\audio\pd\bin" /libpath:"..\flext\pd-msvc\\" !ELSEIF "$(CFG)" == "xsample - Win32 Debug" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"c:\programme\audio\pd\bin\\" /libpath:"..\..\flext\pd-msvc\\" +# ADD LINK32 kernel32.lib user32.lib pd.lib flext_d-pdwin.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"c:\programme\audio\pd\bin\\" /libpath:"..\flext\pd-msvc\\" !ENDIF @@ -92,36 +92,36 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=..\readme.txt +SOURCE=".\make-files.txt" # End Source File -# End Group # Begin Source File -SOURCE=.\groove.cpp +SOURCE=.\readme.txt # End Source File +# End Group # Begin Source File -SOURCE=.\inter.ci +SOURCE=.\source\groove.cpp # End Source File # Begin Source File -SOURCE=.\inter.cpp +SOURCE=.\source\inter.cpp # End Source File # Begin Source File -SOURCE=.\main.cpp +SOURCE=.\source\main.cpp # End Source File # Begin Source File -SOURCE=.\main.h +SOURCE=.\source\main.h # End Source File # Begin Source File -SOURCE=.\play.cpp +SOURCE=.\source\play.cpp # End Source File # Begin Source File -SOURCE=.\record.cpp +SOURCE=.\source\record.cpp # End Source File # End Target # End Project |