diff options
Diffstat (limited to 'externals/grill/xsample/source')
| -rw-r--r-- | externals/grill/xsample/source/groove.cpp | 8 | ||||
| -rw-r--r-- | externals/grill/xsample/source/inter.ci | 10 | ||||
| -rw-r--r-- | externals/grill/xsample/source/inter.cpp | 2 | ||||
| -rw-r--r-- | externals/grill/xsample/source/main.cpp | 6 | ||||
| -rw-r--r-- | externals/grill/xsample/source/main.h | 6 | ||||
| -rw-r--r-- | externals/grill/xsample/source/makefile.bcc | 74 | ||||
| -rw-r--r-- | externals/grill/xsample/source/makefile.pd-cygwin | 89 | ||||
| -rw-r--r-- | externals/grill/xsample/source/makefile.pd-linux | 90 | ||||
| -rw-r--r-- | externals/grill/xsample/source/play.cpp | 10 | ||||
| -rw-r--r-- | externals/grill/xsample/source/record.cpp | 8 | ||||
| -rw-r--r-- | externals/grill/xsample/source/xsample.dsp | 127 |
11 files changed, 35 insertions, 395 deletions
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/makefile.pd-linux b/externals/grill/xsample/source/makefile.pd-linux deleted file mode 100644 index 2dba8cec..00000000 --- a/externals/grill/xsample/source/makefile.pd-linux +++ /dev/null @@ -1,90 +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-linux" -# to install (as root), do "make -f makefile.pd-linux install" -# - -## EDIT ZONE ################################## - -# 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 - -############################################### - -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 -LIBS=m - -# ---------------------------------------------- -# 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-linux -TARGET=$(TARGDIR)/$(NAME).pd_linux - -# 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%,$(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/source/xsample.dsp deleted file mode 100644 index 838d709d..00000000 --- a/externals/grill/xsample/source/xsample.dsp +++ /dev/null @@ -1,127 +0,0 @@ -# Microsoft Developer Studio Project File - Name="xsample" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=xsample - 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 "xsample.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 "xsample.mak" CFG="xsample - Win32 Debug" -!MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: -!MESSAGE -!MESSAGE "xsample - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE "xsample - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "xsample" -# PROP Scc_LocalPath ".." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "xsample - 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 "..\msvc" -# PROP Intermediate_Dir "..\msvc" -# 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 "XSAMPLE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /G6 /W3 /O2 /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /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 /nologo /dll /machine:I386 /libpath:"c:\programme\audio\pd\bin" /libpath:"..\..\flext\pd-msvc\\" - -!ELSEIF "$(CFG)" == "xsample - 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 "..\msvc-debug" -# PROP Intermediate_Dir "..\msvc-debug" -# 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 "XSAMPLE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W3 /Gm /ZI /Od /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /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 /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"c:\programme\audio\pd\bin\\" /libpath:"..\..\flext\pd-msvc\\" - -!ENDIF - -# Begin Target - -# Name "xsample - Win32 Release" -# Name "xsample - Win32 Debug" -# Begin Group "doc" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\readme.txt -# End Source File -# End Group -# Begin Source File - -SOURCE=.\groove.cpp -# End Source File -# Begin Source File - -SOURCE=.\inter.ci -# End Source File -# Begin Source File - -SOURCE=.\inter.cpp -# End Source File -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# Begin Source File - -SOURCE=.\main.h -# End Source File -# Begin Source File - -SOURCE=.\play.cpp -# End Source File -# Begin Source File - -SOURCE=.\record.cpp -# End Source File -# End Target -# End Project |