Pd-cvs December 2004

pd-cvs@lists.iem.at

7 participants
231 discussions

externals/grill/flext/source flclass.h,1.47,1.48 flout.cpp,1.18,1.19 flqueue.cpp,1.21,1.22 flstdc.h,1.27,1.28 flsupport.h,1.72,1.73
by Thomas Grill 17 Dec '04

17 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8452/source Modified Files: flclass.h flout.cpp flqueue.cpp flstdc.h flsupport.h Log Message: global system lock functions fixed a thread sensitive spot fix for _long_ attribute dialogs build system for flext-based externals typo fixed in attribute editor atom outlet functions Index: flqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flqueue.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** flqueue.cpp 9 Nov 2004 03:31:34 -0000 1.21 --- flqueue.cpp 17 Dec 2004 05:01:18 -0000 1.22 *************** *** 33,37 **** { public: ! void Set(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) { th = t,out = o,sym = s,argc = ac,argv = av; } // \note PD sys lock must already be held by caller --- 33,41 ---- { public: ! void Set(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) ! { ! th = t; out = o; ! sym = s,argc = ac,argv = av; ! } // \note PD sys lock must already be held by caller *************** *** 99,106 **** t_atom *at = GetAtoms(1); SetInt(*at,dt); #if FLEXT_SYS == FLEXT_SYS_PD ! const t_symbol *sym = sym_float; #elif FLEXT_SYS == FLEXT_SYS_MAX ! const t_symbol *sym = sym_int; #else #error Not implemented! --- 103,111 ---- t_atom *at = GetAtoms(1); SetInt(*at,dt); + const t_symbol *sym; #if FLEXT_SYS == FLEXT_SYS_PD ! sym = sym_float; #elif FLEXT_SYS == FLEXT_SYS_MAX ! sym = sym_int; #else #error Not implemented! *************** *** 116,119 **** --- 121,148 ---- } + void Push(flext_base *th,int o,const t_atom &a) + { + t_atom *at = GetAtoms(1); + *at = a; + const t_symbol *sym; + if(IsSymbol(a)) + sym = sym_symbol; + else if(IsFloat(a)) + sym = sym_float; + #if FLEXT_SYS == FLEXT_SYS_MAX + else if(IsInt(a)) + sym = sym_int; + #endif + #if FLEXT_SYS == FLEXT_SYS_PD + else if(IsPointer(a)) + sym = sym_pointer; + #endif + else { + error("atom type not supported"); + return; + } + Set(th,o,sym,1,at); + } + void Push(flext_base *th,int o,int argc,const t_atom *argv) { *************** *** 313,316 **** --- 342,351 ---- } + void flext_base::ToQueueAtom(int o,const t_atom &at) const + { + queue.Push(const_cast<flext_base *>(this),o,at); + Trigger(); + } + void flext_base::ToQueueList(int o,int argc,const t_atom *argv) const { Index: flstdc.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** flstdc.h 16 Dec 2004 05:01:07 -0000 1.27 --- flstdc.h 17 Dec 2004 05:01:18 -0000 1.28 *************** *** 119,122 **** --- 119,123 ---- #include "ext.h" #include "ext_user.h" + #include "ext_critical.h" #include "z_dsp.h" Index: flout.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flout.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** flout.cpp 16 Dec 2004 05:01:07 -0000 1.18 --- flout.cpp 17 Dec 2004 05:01:18 -0000 1.19 *************** *** 26,29 **** --- 26,52 ---- void flext_base::ToSysAnything(int n,const t_symbol *s,int argc,const t_atom *argv) const { outlet *o = GetOut(n); if(o) { CRITON(); outlet_anything((t_outlet *)o,const_cast<t_symbol *>(s),argc,(t_atom *)argv); CRITOFF(); } } + void flext_base::ToSysAtom(int n,const t_atom &at) const + { + outlet *o = GetOut(n); + if(o) { + CRITON(); + if(IsSymbol(at)) + outlet_symbol((t_outlet *)o,const_cast<t_symbol *>(GetSymbol(at))); + else if(IsFloat(at)) + outlet_float((t_outlet *)o,GetFloat(at)); + #if FLEXT_SYS == FLEXT_SYS_MAX + else if(IsInt(at)) + outlet_flint((t_outlet *)o,GetInt(at)); + #endif + #if FLEXT_SYS == FLEXT_SYS_PD + else if(IsPointer(at)) + outlet_pointer((t_outlet *)o,GetPointer(at)); + #endif + else + error("Atom type not supported"); + CRITOFF(); + } + } + #elif FLEXT_SYS == FLEXT_SYS_JMAX *************** *** 53,56 **** --- 76,80 ---- void flext_base::ToOutInt(int n,int f) const { if(CHKTHR()) ToSysInt(n,f); else ToQueueInt(n,f); } void flext_base::ToOutSymbol(int n,const t_symbol *s) const { if(CHKTHR()) ToSysSymbol(n,s); else ToQueueSymbol(n,s); } + void flext_base::ToOutAtom(int n,const t_atom &at) const { if(CHKTHR()) ToSysAtom(n,at); else ToQueueAtom(n,at); } void flext_base::ToOutList(int n,int argc,const t_atom *argv) const { if(CHKTHR()) ToSysList(n,argc,argv); else ToQueueList(n,argc,argv); } void flext_base::ToOutAnything(int n,const t_symbol *s,int argc,const t_atom *argv) const { if(CHKTHR()) ToSysAnything(n,s,argc,argv); else ToQueueAnything(n,s,argc,argv); } Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** flsupport.h 28 Nov 2004 05:01:00 -0000 1.72 --- flsupport.h 17 Dec 2004 05:01:18 -0000 1.73 *************** *** 438,446 **** static bool CanbePointer(const t_atom &a) { return IsPointer(a); } //! Access the pointer value (without type check) ! static void *GetPointer(const t_atom &a) { return a.a_w.w_gpointer; } //! Check for a pointer and get its value ! static void *GetAPointer(const t_atom &a,void *def = NULL) { return IsPointer(a)?GetPointer(a):def; } //! Set the atom to represent a pointer ! static void SetPointer(t_atom &a,void *p) { a.a_type = A_POINTER; a.a_w.w_gpointer = (t_gpointer *)p; } #elif FLEXT_SYS == FLEXT_SYS_MAX --- 438,446 ---- static bool CanbePointer(const t_atom &a) { return IsPointer(a); } //! Access the pointer value (without type check) ! static t_gpointer *GetPointer(const t_atom &a) { return a.a_w.w_gpointer; } //! Check for a pointer and get its value ! static t_gpointer *GetAPointer(const t_atom &a,t_gpointer *def = NULL) { return IsPointer(a)?GetPointer(a):def; } //! Set the atom to represent a pointer ! static void SetPointer(t_atom &a,t_gpointer *p) { a.a_type = A_POINTER; a.a_w.w_gpointer = (t_gpointer *)p; } #elif FLEXT_SYS == FLEXT_SYS_MAX *************** *** 646,649 **** --- 646,672 ---- // --- thread stuff ----------------------------------------------- + /*! \defgroup FLEXT_S_LOCK Global system locking + @{ + */ + + #if FLEXT_SYS == FLEXT_SYS_PD + #if PD_MINOR_VERSION >= 38 || (PD_MINOR_VERSION >= 37 && defined(PD_DEVEL_VERSION)) + static void Lock() { sys_lock(); } + static void Unlock() { sys_unlock(); } + #else + // no system locking for old PD versions + static void Lock() {} + static void Unlock() {} + #endif + #elif FLEXT_SYS == FLEXT_SYS_MAX + // Max 4.2 upwards! + static void Lock() { critical_enter(0); } + static void Unlock() { critical_exit(0); } + #else + #error + #endif + + //! @} FLEXT_S_LOCK + #ifdef FLEXT_THREADS /*! \defgroup FLEXT_S_THREAD Flext thread handling Index: flclass.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flclass.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** flclass.h 15 Nov 2004 03:30:59 -0000 1.47 --- flclass.h 17 Dec 2004 05:01:17 -0000 1.48 *************** *** 232,235 **** --- 232,238 ---- void ToOutString(int n,const char *s) const { ToOutSymbol(n,MakeSymbol(s)); } + //! Output atom (index n starts with 0) + void ToOutAtom(int n,const t_atom &at) const; + //! Output list (index n starts with 0) void ToOutList(int n,int argc,const t_atom *argv) const; *************** *** 265,268 **** --- 268,274 ---- void ToQueueString(int n,const char *s) const { ToQueueSymbol(n,MakeSymbol(s)); } + //! Output atom (index n starts with 0) + void ToQueueAtom(int n,const t_atom &at) const; + //! Output list (index n starts with 0) void ToQueueList(int n,int argc,const t_atom *argv) const; *************** *** 293,296 **** --- 299,305 ---- void ToSelfString(int n,const char *s) const { ToSelfSymbol(n,MakeSymbol(s)); } + //! Output atom (index n starts with 0) + void ToSelfAtom(int n,const t_atom &at) const { ToQueueAtom(-1-n,at); } + //! Send list to self (inlet n) void ToSelfList(int n,int argc,const t_atom *argv) const { ToQueueList(-1-n,argc,argv); } *************** *** 737,740 **** --- 746,750 ---- void ToSysBool(int n,bool f) const { ToSysInt(n,f?1:0); } void ToSysSymbol(int n,const t_symbol *s) const; + void ToSysAtom(int n,const t_atom &at) const; void ToSysList(int n,int argc,const t_atom *argv) const; void ToSysAnything(int n,const t_symbol *s,int argc,const t_atom *argv) const;

1 0

externals/grill/flext/build config-win-max-msvc.def,NONE,1.1 config-win-max-msvc.txt,NONE,1.1 config-win-pd-msvc.def,NONE,1.1 config-win-pd-msvc.txt,NONE,1.1 make-win-gen-msvc.inc,NONE,1.1 make-win-max-msvc.inc,NONE,1.1 make-win-msvc.inc,NONE,1.1 make-win-pd-msvc.inc,NONE,1.1
by Thomas Grill 17 Dec '04

17 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8452/build Added Files: config-win-max-msvc.def config-win-max-msvc.txt config-win-pd-msvc.def config-win-pd-msvc.txt make-win-gen-msvc.inc make-win-max-msvc.inc make-win-msvc.inc make-win-pd-msvc.inc Log Message: global system lock functions fixed a thread sensitive spot fix for _long_ attribute dialogs build system for flext-based externals typo fixed in attribute editor atom outlet functions --- NEW FILE: config-win-pd-msvc.txt --- # where is PD? PDPATH=c:\programme\audio\pd # where do the flext libraries reside? FLEXTPATH=$(PDPATH)\flext # where is MS VC++? # (not necessary if the build is run with the compiler environment) # MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 # where should the external be built? OUTPATH=pd-msvc # where should the external be installed? # (leave blank to omit installation) INSTPATH=$(PDPATH)\extra # user defined compiler flags # (check if they match your system!) UFLAGS=/G6 /Ox /arch:SSE --- NEW FILE: config-win-pd-msvc.def --- # where is PD? PDPATH=c:\programme\audio\pd # where do the flext libraries reside? FLEXTPATH=$(PDPATH)\flext # where is MS VC++? # (not necessary if the build is run with the compiler environment) # MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 # where should the external be built? OUTPATH=pd-msvc # where should the external be installed? # (leave blank to omit installation) INSTPATH=$(PDPATH)\extra # user defined compiler flags # (check if they match your system!) UFLAGS=/G6 /Ox /arch:SSE --- NEW FILE: make-win-pd-msvc.inc --- DEFS=$(DEFS) /DFLEXT_SYS=2 INCPATH=$(INCPATH) /I$(PDPATH)\src LIBPATH=$(LIBPATH) /LIBPATH:$(PDPATH)\bin # these are both in PDPATH LIBS=$(LIBS) pd.lib pthreadVC.lib EXT=dll ######################################### !ifdef FLEXT_SHARED # --- shared --- !elseifdef FLEXT_THREADED # --- static multi-threaded --- !ifdef _DEBUG LIBS=$(LIBS) flext_td-pdwin.lib !else LIBS=$(LIBS) flext_t-pdwin.lib !endif !else # --- static single-threaded --- !ifdef _DEBUG LIBS=$(LIBS) flext_d-pdwin.lib !else LIBS=$(LIBS) flext-pdwin.lib !endif !endif --- NEW FILE: make-win-gen-msvc.inc --- INCPATH=$(INCPATH) /I$(FLEXTPATH) LIBPATH=$(LIBPATH) /LIBPATH:$(FLEXTPATH) !ifdef MSVCPATH INCPATH=$(INCPATH) /I$(MSVCPATH)\include LIBPATH=$(LIBPATH) /LIBPATH:$(MSVCPATH)\lib !endif # add user flags CFLAGS=$(UFLAGS) # for VC7 - exception handling CFLAGS=$(CFLAGS) /EHsc ############################################## # use multithreaded static libraries !ifdef _DEBUG CFLAGS=$(CFLAGS) /DMTd !else CFLAGS=$(CFLAGS) /DMT !endif !ifdef FLEXT_SHARED # --- shared --- DEFS=$(DEFS) /DFLEXT_SHARED !elseifdef FLEXT_THREADED # --- static multi-threaded --- DEFS=$(DEFS) /DFLEXT_THREADS !else # --- static single-threaded --- !endif ############################################## all: $(OUTPATH) $(OUTPATH)\$(NAME).$(EXT) # remove build clean: -del /q $(OUTPATH) > nul -rmdir $(OUTPATH) > nul OBJS= $(SRCS:.c=.obj) OBJS= $(OBJS:.objpp=.obj) $(OUTPATH): -mkdir $(OUTPATH) > nul {$(SRCDIR)}.cpp{}.obj: cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@ {$(SRCDIR)}.c{}.obj: cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@ $(OUTPATH)\$(NAME).$(EXT): $(OBJS) cd $(OUTPATH) link /DLL $(LDFLAGS) /out:$(NAME).$(EXT) /INCREMENTAL:NO $** $(LIBS) $(LIBPATH) @-del *.exp @-del *.lib cd .. !ifdef INSTPATH @-if not exist $(INSTPATH) mkdir $(INSTPATH) copy $@ $(INSTPATH) > nul !endif --- NEW FILE: config-win-max-msvc.def --- # where are the Max/MSP SDK header files? # you should have the latest version! MAXSDKPATH="c:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support" # where do the flext libraries reside? FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" # where is MS VC++? # (need not be defined if the build is started with the compiler environment set) # MSVCPATH="c:\programme\prog\microsoft visual studio\VC98" # where should the external be built? # (path for temporary files) OUTPATH=max-msvc # where should the external be installed? # (leave blank to omit installation) INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" # some user-definable flags # (check if they match your system!) UFLAGS=/G6 /Ox /arch:SSE --- NEW FILE: make-win-max-msvc.inc --- DEFS=$(DEFS) /DFLEXT_SYS=1 CFLAGS=$(CFLAGS) /Zp2 INCPATH=$(INCPATH) /I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes LIBPATH=$(LIBPATH) /LIBPATH:$(MAXSDKPATH)\max-includes /LIBPATH:$(MAXSDKPATH)\msp-includes # these are both in MAXSDKPATH LIBS=$(LIBS) maxapi.lib maxaudio.lib EXT=mxe ######################################### !ifdef FLEXT_SHARED # --- shared --- !elseifdef FLEXT_THREADED # --- static multi-threaded --- !ifdef _DEBUG LIBS=$(LIBS) flext_td-maxwin.lib !else LIBS=$(LIBS) flext_t-maxwin.lib !endif !else # --- static single-threaded --- !ifdef _DEBUG LIBS=$(LIBS) flext_d-maxwin.lib !else LIBS=$(LIBS) flext-maxwin.lib !endif !endif --- NEW FILE: make-win-msvc.inc --- !ifdef $(MAX) # Max/MSP !include config-pd-msvc.txt !include makefile-msvc.txt !include ..\flext\build\make-win-max-msvc.inc !elseifdef $(PD) # PD !include config-pd-msvc.txt !include makefile-msvc.txt !include ..\flext\build\make-win-pd-msvc.inc !else !error Platform not supported !endif # all the source files from the package !include make-files.txt # now build !include ..\flext\build\make-win-gen-msvc.inc --- NEW FILE: config-win-max-msvc.txt --- # where are the Max/MSP SDK header files? # you should have the latest version! MAXSDKPATH="c:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support" # where do the flext libraries reside? FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext" # where is MS VC++? # (need not be defined if the build is started with the compiler environment set) # MSVCPATH="c:\programme\prog\microsoft visual studio\VC98" # where should the external be built? # (path for temporary files) OUTPATH=max-msvc # where should the external be installed? # (leave blank to omit installation) INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext" # some user-definable flags # (check if they match your system!) UFLAGS=/G6 /Ox /arch:SSE

1 0

externals/grill/flext changes.txt,1.63,1.64 config-max-msvc.txt,1.4,1.5 config-pd-msvc.txt,1.9,1.10 flext.vcproj,1.34,1.35 make-inc.max-msvc,1.5,1.6 make-inc.pd-msvc,1.11,1.12
by Thomas Grill 17 Dec '04

17 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8452 Modified Files: changes.txt config-max-msvc.txt config-pd-msvc.txt flext.vcproj make-inc.max-msvc make-inc.pd-msvc Log Message: global system lock functions fixed a thread sensitive spot fix for _long_ attribute dialogs build system for flext-based externals typo fixed in attribute editor atom outlet functions Index: make-inc.pd-msvc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/make-inc.pd-msvc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** make-inc.pd-msvc 12 Dec 2003 22:46:39 -0000 1.11 --- make-inc.pd-msvc 17 Dec 2004 05:01:17 -0000 1.12 *************** *** 76,83 **** !ifndef _DEBUG ! CFLAGS=$(CFLAGS) $(OFLAGS) /ML OBJPATH=s !else ! CFLAGS=$(CFLAGS) $(DFLAGS) /MLd OBJPATH=sd !endif --- 76,83 ---- !ifndef _DEBUG ! CFLAGS=$(CFLAGS) $(OFLAGS) /MT OBJPATH=s !else ! CFLAGS=$(CFLAGS) $(DFLAGS) /MTd OBJPATH=sd !endif Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** changes.txt 16 Dec 2004 05:01:05 -0000 1.63 --- changes.txt 17 Dec 2004 05:01:15 -0000 1.64 *************** *** 22,25 **** --- 22,28 ---- - fix for long attribute dialogs - dropped support for Max UI objects + - added global system locking + - added general atom outlet functions To{Sys,Out,Queue}Atom + - added build system for flext-based externals 0.4.7: Index: config-max-msvc.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-max-msvc.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config-max-msvc.txt 11 Aug 2004 04:04:22 -0000 1.4 --- config-max-msvc.txt 17 Dec 2004 05:01:15 -0000 1.5 *************** *** 4,8 **** # where is the Max SDK? ! MAXSDKPATH="F:\prog\audio\maxmspsdk_win\4.5 headers\c74support" # where is MS VC++? --- 4,8 ---- # where is the Max SDK? ! MAXSDKPATH="C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support" # where is MS VC++? Index: config-pd-msvc.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-msvc.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** config-pd-msvc.txt 10 Aug 2004 03:32:04 -0000 1.9 --- config-pd-msvc.txt 17 Dec 2004 05:01:15 -0000 1.10 *************** *** 1,4 **** # flext - C++ layer for Max/MSP and pd (pure data) externals ! # Copyright (c) 2001-2003 Thomas Grill (xovo(a)gmx.net) # --- 1,4 ---- # flext - C++ layer for Max/MSP and pd (pure data) externals ! # Copyright (c) 2001-2004 Thomas Grill (gr(a)grrrr.org) # *************** *** 8,12 **** # where is the pthreads package? # (comment out if you use the standard pd package where pthreads are included) ! # PTHREADS=F:\prog\packs\pthreads # where is MS VC++? --- 8,12 ---- # where is the pthreads package? # (comment out if you use the standard pd package where pthreads are included) ! # PTHREADS=c:\data\prog\packs\pthreads # where is MS VC++? *************** *** 17,26 **** # headers are searched in SNDOBJ/include, the sndobj.lib in SNDOBJ/lib # (leave blank or comment out to disable SndObj support) ! SNDOBJ=f:\prog\audio\sndobj # where is the STK include directory? # headers are searched in STK/include, the stk.lib in STK/lib # (leave blank or comment out to disable STK support) ! STK=f:\prog\audio\stk # where should flext libraries be built? --- 17,26 ---- # headers are searched in SNDOBJ/include, the sndobj.lib in SNDOBJ/lib # (leave blank or comment out to disable SndObj support) ! SNDOBJ=c:\data\prog\audio\sndobj # where is the STK include directory? # headers are searched in STK/include, the stk.lib in STK/lib # (leave blank or comment out to disable STK support) ! STK=c:\data\prog\audio\stk # where should flext libraries be built? Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** flext.vcproj 18 Nov 2004 03:31:03 -0000 1.34 --- flext.vcproj 17 Dec 2004 05:01:15 -0000 1.35 *************** *** 122,126 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD" BasicRuntimeChecks="3" --- 122,126 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD" BasicRuntimeChecks="3" *************** *** 224,228 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_USE_SIMD" StringPooling="TRUE" --- 224,228 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_USE_SIMD" StringPooling="TRUE" *************** *** 699,703 **** FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" ! AdditionalIncludeDirectories="F:\prog\audio\MaxWinSDK\c74support\max-includes,F:\prog\audio\MaxWinSDK\c74support\msp-includes,f:\prog\packs\pthreads,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_MAX;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS" StringPooling="TRUE" --- 699,703 ---- FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" ! AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_MAX;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS" StringPooling="TRUE" *************** *** 754,758 **** FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" ! AdditionalIncludeDirectories="F:\prog\audio\MaxWinSDK\c74support\max-includes,F:\prog\audio\MaxWinSDK\c74support\msp-includes,f:\prog\packs\pthreads,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_LIB;FLEXT_SYS_MAX;FLEXT_USE_SIMD;FLEXT_EXPORTS;FLEXT_THREADS" StringPooling="TRUE" --- 754,758 ---- FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" ! AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_LIB;FLEXT_SYS_MAX;FLEXT_USE_SIMD;FLEXT_EXPORTS;FLEXT_THREADS" StringPooling="TRUE" *************** *** 4043,4047 **** </FileConfiguration> <FileConfiguration ! Name="PD Threads Debug|Win32"> <Tool Name="VCCLCompilerTool" --- 4043,4048 ---- </FileConfiguration> <FileConfiguration ! Name="PD Threads Debug|Win32" ! ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" *************** *** 4063,4067 **** </FileConfiguration> <FileConfiguration ! Name="PD Threads Release|Win32"> <Tool Name="VCCLCompilerTool" --- 4064,4069 ---- </FileConfiguration> <FileConfiguration ! Name="PD Threads Release|Win32" ! ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" *************** *** 4243,4247 **** </FileConfiguration> <FileConfiguration ! Name="PD Threads Debug|Win32"> <Tool Name="VCCLCompilerTool" --- 4245,4250 ---- </FileConfiguration> <FileConfiguration ! Name="PD Threads Debug|Win32" ! ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" *************** *** 4263,4267 **** </FileConfiguration> <FileConfiguration ! Name="PD Threads Release|Win32"> <Tool Name="VCCLCompilerTool" --- 4266,4271 ---- </FileConfiguration> <FileConfiguration ! Name="PD Threads Release|Win32" ! ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" Index: make-inc.max-msvc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/make-inc.max-msvc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** make-inc.max-msvc 10 Feb 2004 03:29:50 -0000 1.5 --- make-inc.max-msvc 17 Dec 2004 05:01:16 -0000 1.6 *************** *** 69,76 **** !ifndef _DEBUG ! CFLAGS=$(CFLAGS) $(OFLAGS) /ML OBJPATH=s !else ! CFLAGS=$(CFLAGS) $(DFLAGS) /MLd OBJPATH=sd !endif --- 69,76 ---- !ifndef _DEBUG ! CFLAGS=$(CFLAGS) $(OFLAGS) /MT OBJPATH=s !else ! CFLAGS=$(CFLAGS) $(DFLAGS) /MTd OBJPATH=sd !endif

1 0

externals/grill/flext/build - New directory
by Thomas Grill 17 Dec '04

17 Dec '04

Update of /cvsroot/pure-data/externals/grill/flext/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8352/build Log Message: Directory /cvsroot/pure-data/externals/grill/flext/build added to the repository

1 0

pd/src m_fifo.c,1.1.2.4,1.1.2.5
by Tim Blechmann 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30195 Modified Files: Tag: devel_0_38 m_fifo.c Log Message: cas/cas2 for ppc Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** m_fifo.c 15 Dec 2004 22:05:59 -0000 1.1.2.4 --- m_fifo.c 16 Dec 2004 13:30:19 -0000 1.1.2.5 *************** *** 91,107 **** } ! #elif defined(__POWERPC__) ! /* gcc on ppc */ \ #define CAS(mem, old, new) \ ({ __typeof__(old) tmp; \ int ret = 0; \ __asm__ __volatile__( \ - "1: \n" \ "lwarx %0,0,%2 \n" \ "cmpw %0,%3 \n" \ "bne 1f \n" \ ! "stwcx %0,0,%4 \n" \ ! "bne 1b \n" \ "li %1,1 \n" \ "1: \n" \ --- 91,107 ---- } ! #elif defined(__POWERPC__) ! /* gcc on ppc */ #define CAS(mem, old, new) \ ({ __typeof__(old) tmp; \ int ret = 0; \ __asm__ __volatile__( \ "lwarx %0,0,%2 \n" \ "cmpw %0,%3 \n" \ "bne 1f \n" \ ! "sync \n" \ ! "stwcx %4,0,%2 \n" \ ! "bne 1f \n" \ "li %1,1 \n" \ "1: \n" \ *************** *** 111,115 **** }) ! #error CAS2 hasn't been implemented for ppc, yet #else --- 111,138 ---- }) ! /* tb: i'm nut sure, if the handling of the two stwcx instructions ! * works correctly and if it's atomic */ ! #define CAS2(mem, old1, old2, new1, new2) \ ! ({ int ret = 0; \ ! __asm__ __volatile__( \ ! "lwarx %0,0,%3 \n" \ ! "cmpw %0,%5 \n" \ ! "bne 1f \n" \ ! "lwarx %1,0,%4 \n" \ ! "cmpw %1,%6 \n" \ ! "bne 1f \n" \ ! "sync \n" \ ! "stwcx %7,0,%3 \n" \ ! "bne 1f \n" \ ! "stwcx %8,0,%4 \n" \ ! "bne 1f \n" \ ! "li %2,1 \n" \ ! "1: \n" \ ! :"=&r"(tmp1), "=&r"(tmp2), "=r"(ret) : \ ! "m" (*mem), "m"(*(mem+(sizeof(__typeof__(old1))), \ ! "r" (old1), "r" (old2), \ ! "r" (new1), "r"(new2), "0"(ret), ); \ ! ret; \ ! }) #else

1 0

pd/src makefile.nt,1.2.4.2,1.2.4.3
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27719/src Modified Files: Tag: devel_0_38 makefile.nt Log Message: fixed to comply to current state Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -C2 -d -r1.2.4.2 -r1.2.4.3 *** makefile.nt 8 Nov 2004 09:37:29 -0000 1.2.4.2 --- makefile.nt 16 Dec 2004 10:26:58 -0000 1.2.4.3 *************** *** 50,56 **** !ifndef TCLDIR ! TCLDIR = C:\Tcl !ifndef TCLINC ! TCLINC = C:\Tcl\include !endif --- 50,56 ---- !ifndef TCLDIR ! TCLDIR = ..\tcl !ifndef TCLINC ! TCLINC = $(TCLDIR)\include !endif *************** *** 88,96 **** GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_ASIO -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO \ ! $(WISHDEF) /ZI LFLAGS = /nologo /DEBUG /MAP /PROFILE ! SYSSRC = s_audio_pa.c s_audio_mmio.c s_midi_pm.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ --- 88,97 ---- GLIB = $(LIBS) $(TCLLIB)\tcl$(TCLVER).lib $(TCLLIB)\tk$(TCLVER).lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO $(WISHDEF) /ZI ! # -DUSEAPI_PORTAUDIO ! # -DUSEAPI_ASIO LFLAGS = /nologo /DEBUG /MAP /PROFILE ! SYSSRC = s_audio_mmio.c s_midi_mmio.c # s_audio_pa.c s_midi_pm.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ *************** *** 107,114 **** x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ ! m_simd.c m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c \ $(SYSSRC) ! PADIR = ..\portaudio_v18 INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c --- 108,115 ---- x_arithmetic.c x_connective.c x_interface.c x_midi.c x_misc.c \ x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c d_soundfile.c \ ! m_simd.c m_simd_sse_vc.c m_simd_sse_gcc.c m_simd_ve_gcc.c m_fifo.c \ $(SYSSRC) ! PADIR = ..\portaudio INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c *************** *** 128,132 **** ! OBJC = $(SRC:.c=.obj) $(PMOBJ) $(PAOBJ) ASIOBJ = s_audio_asio.obj asio.obj asiolist.obj asiodrivers.obj --- 129,133 ---- ! OBJC = $(SRC:.c=.obj) # $(PMOBJ) $(PAOBJ) ASIOBJ = s_audio_asio.obj asio.obj asiolist.obj asiodrivers.obj *************** *** 153,176 **** ..\bin\pd.exe: s_entry.obj ..\bin\pd.lib ! link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO s_entry.obj \ ! ..\bin\pd.lib $(LIBS) ! ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) ASIOBJ ! link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $(OBJC) \ ! $(ASIOBJ) $(LIBS) /PDB:..\bin\pddll.pdb ..\bin\pdtcl.dll: t_tkcmd.obj ! link $(LFLAGS) /dll /export:Pdtcl_Init /out:..\bin\pdtcl.dll \ ! t_tkcmd.obj $(GLIB) ..\bin\pd.tk: u_main.tk; copy u_main.tk ..\bin\pd.tk ..\bin\pdsend.exe: u_pdsend.obj ! link $(LFLAGS) /out:..\bin\pdsend.exe /INCREMENTAL:NO u_pdsend.obj \ ! $(LIBS) ..\bin\pdreceive.exe: u_pdreceive.obj ! link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO u_pdreceive.obj \ ! $(LIBS) # explicit rules to compile portaudio sources: --- 154,173 ---- ..\bin\pd.exe: s_entry.obj ..\bin\pd.lib ! link $(LFLAGS) /out:..\bin\pd.exe /INCREMENTAL:NO $** $(LIBS) ! ..\bin\pd.dll ..\bin\pd.lib: $(OBJC) # ASIOBJ ! link $(LFLAGS) /dll /export:sys_main /out:..\bin\pd.dll $** \ ! $(LIBS) /PDB:..\bin\pddll.pdb ..\bin\pdtcl.dll: t_tkcmd.obj ! link $(LFLAGS) /dll /export:Pdtcl_Init /out:..\bin\pdtcl.dll $** $(GLIB) ..\bin\pd.tk: u_main.tk; copy u_main.tk ..\bin\pd.tk ..\bin\pdsend.exe: u_pdsend.obj ! link $(LFLAGS) /out:..\bin\pdsend.exe /INCREMENTAL:NO $** $(LIBS) ..\bin\pdreceive.exe: u_pdreceive.obj ! link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO $** $(LIBS) # explicit rules to compile portaudio sources:

1 0

externals/grill/xsample/xsample.xcode project.pbxproj,NONE,1.1
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/xsample/xsample.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv334/xsample.xcode Added Files: project.pbxproj Log Message: - made xcode project - fixed loop record bug - some small cleanups --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 39; objects = { 034768DDFF38A45A11DB9C8B = { children = ( D2AAC09D05546B4700DB518D, E9974E53077083C700206F68, ); isa = PBXGroup; name = Products; refType = 4; sourceTree = "<group>"; }; //030 //031 //032 //033 //034 //080 //081 //082 //083 //084 0867D690FE84028FC02AAC07 = { buildSettings = { }; buildStyles = ( 4F0BB7EC011F40E904CA0E50, 4F0BB7ED011F40E904CA0E50, ); hasScannedForEncodings = 1; isa = PBXProject; mainGroup = 0867D691FE84028FC02AAC07; productRefGroup = 034768DDFF38A45A11DB9C8B; projectDirPath = ""; targets = ( D2AAC09C05546B4700DB518D, E9974E52077083C700206F68, ); }; 0867D691FE84028FC02AAC07 = { children = ( E9974EC507708CFA00206F68, 08FB77ACFE841707C02AAC07, 0867D69AFE84028FC02AAC07, 034768DDFF38A45A11DB9C8B, ); isa = PBXGroup; name = xsample; refType = 4; sourceTree = "<group>"; }; 0867D69AFE84028FC02AAC07 = { children = ( E9974E060770761500206F68, E9974E04077075E800206F68, E9974DFA0770750400206F68, E9974DFB0770750400206F68, ); isa = PBXGroup; name = "External Frameworks and Libraries"; refType = 4; sourceTree = "<group>"; }; 08FB77ACFE841707C02AAC07 = { children = ( E9974EAF07708BF700206F68, E9974E58077084DA00206F68, E9974E2B07707D1400206F68, E9974DE50770749400206F68, E9974DE60770749400206F68, E9974DE70770749400206F68, E9974DE80770749400206F68, E9974DE90770749400206F68, E9974DEA0770749400206F68, E9974DEB0770749400206F68, ); isa = PBXGroup; name = Source; refType = 4; sourceTree = "<group>"; }; //080 //081 //082 //083 //084 //4F0 //4F1 //4F2 //4F3 //4F4 4F0BB7EC011F40E904CA0E50 = { buildSettings = { COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; GCC_ALTIVEC_EXTENSIONS = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = source/prefix.h; OPTIMIZATION_CFLAGS = "-O0"; ZERO_LINK = YES; }; isa = PBXBuildStyle; name = Development; }; 4F0BB7ED011F40E904CA0E50 = { buildSettings = { COPY_PHASE_STRIP = YES; GCC_ALTIVEC_EXTENSIONS = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = source/prefix.h; ZERO_LINK = NO; }; isa = PBXBuildStyle; name = Deployment; }; //4F0 //4F1 //4F2 //4F3 //4F4 //D20 //D21 //D22 //D23 //D24 D2AAC09905546B4700DB518D = { buildActionMask = 2147483647; files = ( E9974DF50770749400206F68, E9974DF70770749400206F68, E9974E2D07707D1400206F68, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC09A05546B4700DB518D = { buildActionMask = 2147483647; files = ( E9974DF30770749400206F68, E9974DF40770749400206F68, E9974DF60770749400206F68, E9974DF80770749400206F68, E9974DF90770749400206F68, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC09B05546B4700DB518D = { buildActionMask = 2147483647; files = ( E9974E05077075E800206F68, ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC09C05546B4700DB518D = { buildPhases = ( D2AAC09905546B4700DB518D, D2AAC09B05546B4700DB518D, D2AAC09A05546B4700DB518D, ); buildRules = ( ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_EXTENSION = pd_darwin; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=2"; HEADER_SEARCH_PATHS = "$(PD)/src $(Flext)/source"; INSTALL_PATH = "$(PD)/extra"; LIBRARY_SEARCH_PATHS = "$(Flext)/build"; LIBRARY_STYLE = BUNDLE; OTHER_LDFLAGS = "-bundle_loader $(PD)/bin/pd"; PRODUCT_NAME = xsample; }; dependencies = ( ); isa = PBXNativeTarget; name = "pd static"; productName = xsample; productReference = D2AAC09D05546B4700DB518D; productType = "com.apple.product-type.library.dynamic"; }; D2AAC09D05546B4700DB518D = { explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; isa = PBXFileReference; path = xsample.pd_darwin; refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; //D20 //D21 //D22 //D23 //D24 //E90 //E91 //E92 //E93 //E94 E9974DE50770749400206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = groove.cpp; path = source/groove.cpp; refType = 4; sourceTree = "<group>"; }; E9974DE60770749400206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = inter.cpp; path = source/inter.cpp; refType = 4; sourceTree = "<group>"; }; E9974DE70770749400206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = inter.h; path = source/inter.h; refType = 4; sourceTree = "<group>"; }; E9974DE80770749400206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = source/main.cpp; refType = 4; sourceTree = "<group>"; }; E9974DE90770749400206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = main.h; path = source/main.h; refType = 4; sourceTree = "<group>"; }; E9974DEA0770749400206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = play.cpp; path = source/play.cpp; refType = 4; sourceTree = "<group>"; }; E9974DEB0770749400206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = record.cpp; path = source/record.cpp; refType = 4; sourceTree = "<group>"; }; E9974DF30770749400206F68 = { fileRef = E9974DE50770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974DF40770749400206F68 = { fileRef = E9974DE60770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974DF50770749400206F68 = { fileRef = E9974DE70770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974DF60770749400206F68 = { fileRef = E9974DE80770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974DF70770749400206F68 = { fileRef = E9974DE90770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974DF80770749400206F68 = { fileRef = E9974DEA0770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974DF90770749400206F68 = { fileRef = E9974DEB0770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974DFA0770750400206F68 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MaxAPI.framework; path = /Library/Frameworks/MaxAPI.framework; refType = 0; sourceTree = "<absolute>"; }; E9974DFB0770750400206F68 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MaxAudioAPI.framework; path = /Library/Frameworks/MaxAudioAPI.framework; refType = 0; sourceTree = "<absolute>"; }; E9974E04077075E800206F68 = { isa = PBXFileReference; lastKnownFileType = archive.ar; name = libflext_s.a; path = /Volumes/Daten/Prog/pdmax/flext/build/libflext_s.a; refType = 0; sourceTree = "<absolute>"; }; E9974E05077075E800206F68 = { fileRef = E9974E04077075E800206F68; isa = PBXBuildFile; settings = { }; }; E9974E060770761500206F68 = { isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libflext-max_s.a"; path = "/Volumes/Daten/Prog/pdmax/flext/build/libflext-max_s.a"; refType = 0; sourceTree = "<absolute>"; }; E9974E2B07707D1400206F68 = { fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = prefix.h; path = source/prefix.h; refType = 4; sourceTree = "<group>"; }; E9974E2D07707D1400206F68 = { fileRef = E9974E2B07707D1400206F68; isa = PBXBuildFile; settings = { }; }; E9974E4F077083C700206F68 = { buildActionMask = 2147483647; files = ( E9974E59077084DA00206F68, E9974EB007708BF700206F68, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; E9974E50077083C700206F68 = { buildActionMask = 2147483647; files = ( E9974E5E0770852000206F68, E9974E5F0770852000206F68, E9974E600770852000206F68, E9974E610770852000206F68, E9974E620770852000206F68, E9974E630770852000206F68, E9974E640770852000206F68, E9974E650770852000206F68, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; E9974E51077083C700206F68 = { buildActionMask = 2147483647; files = ( E9974E5C0770851700206F68, E9974E5B0770851500206F68, E9974E5A0770851200206F68, ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; E9974E52077083C700206F68 = { buildPhases = ( E9974E4F077083C700206F68, E9974E50077083C700206F68, E9974E51077083C700206F68, E9974EC207708C9300206F68, ); buildRules = ( ); buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=1"; HEADER_SEARCH_PATHS = "$(Max SDK)/max-includes $(Max SDK)/msp-includes $(Flext)/source"; INFOPLIST_FILE = "source/xsample-Info.plist"; INSTALL_PATH = "\"/Library/Application Support/Cycling '74/externals\""; LIBRARY_SEARCH_PATHS = "$(Flext)/build"; LIBRARY_STYLE = DYNAMIC; OPTIMIZATION_CFLAGS = ""; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = xsample; SECTORDER_FLAGS = ""; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; WRAPPER_EXTENSION = mxo; }; dependencies = ( ); isa = PBXNativeTarget; name = "max static"; productName = "Max xsample static"; productReference = E9974E53077083C700206F68; productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> <plist version=\"1.0\"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> <string>Max xsample static</string> <key>CFBundleIdentifier</key> <string>com.yourcompany.Max_xsample_static</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>1.0</string> <key>CSResourcesFileMapped</key> <string>yes</string> </dict> </plist> "; productType = "com.apple.product-type.bundle"; }; E9974E53077083C700206F68 = { explicitFileType = wrapper.cfbundle; includeInIndex = 0; isa = PBXFileReference; path = xsample.mxo; refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; E9974E58077084DA00206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.xml; name = "xsample-Info.plist"; path = "source/xsample-Info.plist"; refType = 4; sourceTree = "<group>"; }; E9974E59077084DA00206F68 = { fileRef = E9974E58077084DA00206F68; isa = PBXBuildFile; settings = { }; }; E9974E5A0770851200206F68 = { fileRef = E9974E060770761500206F68; isa = PBXBuildFile; settings = { }; }; E9974E5B0770851500206F68 = { fileRef = E9974DFA0770750400206F68; isa = PBXBuildFile; settings = { }; }; E9974E5C0770851700206F68 = { fileRef = E9974DFB0770750400206F68; isa = PBXBuildFile; settings = { }; }; E9974E5E0770852000206F68 = { fileRef = E9974E2B07707D1400206F68; isa = PBXBuildFile; settings = { }; }; E9974E5F0770852000206F68 = { fileRef = E9974DE50770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974E600770852000206F68 = { fileRef = E9974DE60770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974E610770852000206F68 = { fileRef = E9974DE70770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974E620770852000206F68 = { fileRef = E9974DE80770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974E630770852000206F68 = { fileRef = E9974DE90770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974E640770852000206F68 = { fileRef = E9974DEA0770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974E650770852000206F68 = { fileRef = E9974DEB0770749400206F68; isa = PBXBuildFile; settings = { }; }; E9974EAF07708BF700206F68 = { isa = PBXFileReference; lastKnownFileType = archive.rsrc; name = xsample.rsrc; path = source/xsample.rsrc; refType = 4; sourceTree = "<group>"; }; E9974EB007708BF700206F68 = { fileRef = E9974EAF07708BF700206F68; isa = PBXBuildFile; settings = { }; }; E9974EC207708C9300206F68 = { buildActionMask = 8; dstPath = "/Library/Application Support/Cycling '74/init"; dstSubfolderSpec = 0; files = ( E9974EC607708D0C00206F68, ); isa = PBXCopyFilesBuildPhase; runOnlyForDeploymentPostprocessing = 1; }; E9974EC307708CED00206F68 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; name = "xsample-objectmappings.txt"; path = "maxmsp/xsample-objectmappings.txt"; refType = 4; sourceTree = "<group>"; }; E9974EC507708CFA00206F68 = { children = ( E9974EC307708CED00206F68, ); isa = PBXGroup; name = Max; refType = 4; sourceTree = "<group>"; }; E9974EC607708D0C00206F68 = { fileRef = E9974EC307708CED00206F68; isa = PBXBuildFile; settings = { }; }; }; rootObject = 0867D690FE84028FC02AAC07; }

1 0

externals/grill/xsample/source prefix.h,NONE,1.1 xsample-Info.plist,NONE,1.1 groove.cpp,1.27,1.28 inter.cpp,1.7,1.8 main.h,1.31,1.32 record.cpp,1.15,1.16
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/xsample/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv334/source Modified Files: groove.cpp inter.cpp main.h record.cpp Added Files: prefix.h xsample-Info.plist Log Message: - made xcode project - fixed loop record bug - some small cleanups Index: groove.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/groove.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** groove.cpp 21 Jun 2004 14:02:12 -0000 1.27 --- groove.cpp 16 Dec 2004 05:02:24 -0000 1.28 *************** *** 198,206 **** xgroove::xgroove(I argc,const t_atom *argv): ! loopmode(xsl_loop),curpos(0), ! _xzone(0),xzone(0),pblksz(0), xfade(xsf_keeplooppos),xshape(xss_lin), ! znidx(NULL),znpos(NULL), ! bidir(1) { I argi = 0; --- 198,206 ---- xgroove::xgroove(I argc,const t_atom *argv): ! loopmode(xsl_loop),curpos(0),bidir(1), ! _xzone(0),xzone(0), xfade(xsf_keeplooppos),xshape(xss_lin), ! znpos(NULL),znmul(NULL),znidx(NULL), ! pblksz(0) { I argi = 0; *************** *** 868,871 **** --- 868,872 ---- SETSIGFUN(posfun,SIGFUN(s_pos_bidir)); break; + default: ; // just to prevent warning } } --- NEW FILE: prefix.h --- /* xsample - extended sample objects for Max/MSP and pd (pure data) Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ #define FLEXT_ATTRIBUTES 1 #include <flext.h> Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** main.h 21 Jun 2004 14:02:12 -0000 1.31 --- main.h 16 Dec 2004 05:02:24 -0000 1.32 *************** *** 12,22 **** #define __XSAMPLE_H ! ! #define XSAMPLE_VERSION "0.3.1pre3" ! ! ! #define FLEXT_ATTRIBUTES 1 ! ! #include <flext.h> #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) --- 12,16 ---- #define __XSAMPLE_H ! #include "prefix.h" #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) *************** *** 24,27 **** --- 18,23 ---- #endif + #define XSAMPLE_VERSION "0.3.1pre3" + // most compilers are somehow broken - in other words - can't handle all C++ features *************** *** 296,300 **** public: ! xinter(); protected: --- 292,296 ---- public: ! xinter(): outchns(1),doplay(false),interp(xsi_4p) {} protected: Index: record.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/record.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** record.cpp 8 Feb 2004 03:40:47 -0000 1.15 --- record.cpp 16 Dec 2004 05:02:24 -0000 1.16 *************** *** 109,117 **** xrecord::xrecord(I argc,const t_atom *argv): ! dorec(false), ! sigmode(false),mixmode(0), ! appmode(true),doloop(false), drintv(0), ! inchns(1) { I argi = 0; --- 109,117 ---- xrecord::xrecord(I argc,const t_atom *argv): ! inchns(1), ! sigmode(false),appmode(true), drintv(0), ! dorec(false),doloop(false), ! mixmode(0) { I argi = 0; *************** *** 395,400 **** for(int ci = 0; ci < ICHNS; ++ci) { register S *b = bf+ci; ! register const F *s = sig[ci]; ! for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b = *s; } si += ncur; --- 395,401 ---- for(int ci = 0; ci < ICHNS; ++ci) { register S *b = bf+ci; ! register const F *s = sig[ci]+si; ! for(i = 0; i < ncur; ++i,b += BCHNS,++s) ! *b = *s; } si += ncur; *************** *** 413,417 **** for(int ci = 0; ci < ICHNS; ++ci) { register S *b = bf+ci; ! register const F *s = sig[ci]; for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b += *s; } --- 414,418 ---- for(int ci = 0; ci < ICHNS; ++ci) { register S *b = bf+ci; ! register const F *s = sig[ci]+si; for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b += *s; } --- NEW FILE: xsample-Info.plist --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> <string>xsample</string> <key>CFBundleIdentifier</key> <string>org.grrrr.xsample</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>1.0</string> <key>CSResourcesFileMapped</key> <string>yes</string> </dict> </plist> Index: inter.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/inter.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** inter.cpp 8 Feb 2004 03:40:47 -0000 1.7 --- inter.cpp 16 Dec 2004 05:02:24 -0000 1.8 *************** *** 25,34 **** } - xinter::xinter(): - doplay(false),outchns(1), - interp(xsi_4p) - { - } - I xinter::m_set(I argc,const t_atom *argv) { --- 25,28 ----

1 0

externals/grill/xsample readme.txt,1.20,1.21
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/xsample In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv334 Modified Files: readme.txt Log Message: - made xcode project - fixed loop record bug - some small cleanups Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/readme.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** readme.txt 21 Jun 2004 14:02:04 -0000 1.20 --- readme.txt 16 Dec 2004 05:02:23 -0000 1.21 *************** *** 84,87 **** --- 84,89 ---- > various versions of GCC die during compile with template optimization turned on + o XCode: use "xsample.xcode" project + Max/MSP - MacOS9: ---------------- *************** *** 94,97 **** --- 96,101 ---- o Metrowerks CodeWarrior: "xsample.cw" project file + o XCode: use "xsample.xcode" project + Max/MSP - Windows: ---------------- *************** *** 122,125 **** --- 126,130 ---- - different initialization on buffer absence - renew units and scalemode on buffer change + - fixed looped recording bug (thanks to Tatama Suomo) 0.3.0:

1 0

externals/grill/xsample/xsample.xcode - New directory
by Thomas Grill 16 Dec '04

16 Dec '04

Update of /cvsroot/pure-data/externals/grill/xsample/xsample.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32748/xsample.xcode Log Message: Directory /cvsroot/pure-data/externals/grill/xsample/xsample.xcode added to the repository

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs December 2004