From 83ff55addd23a3536ed179b58498a95321ce0482 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 12 Aug 2003 02:41:22 +0000 Subject: "" svn path=/trunk/; revision=843 --- externals/grill/flext/flext.vcproj | 51 +- externals/grill/flext/source/flbuf.cpp | 8 +- externals/grill/flext/source/fldsp.cpp | 13 +- externals/grill/flext/source/flsupport.h | 6 +- externals/grill/py/py.vcproj | 391 +++++-- externals/grill/vasp/vasp.vcproj | 1486 ++++++++++++++++++-------- externals/grill/vst/vst.vcproj | 196 +++- externals/grill/xsample/maxmsp/xgroove~.help | Bin 7578 -> 7572 bytes externals/grill/xsample/source/inter.h | 15 +- externals/grill/xsample/source/main.h | 6 +- externals/grill/xsample/xsample.vcproj | 30 +- 11 files changed, 1560 insertions(+), 642 deletions(-) diff --git a/externals/grill/flext/flext.vcproj b/externals/grill/flext/flext.vcproj index 158ff23d..303c23ac 100644 --- a/externals/grill/flext/flext.vcproj +++ b/externals/grill/flext/flext.vcproj @@ -31,10 +31,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\tdl/flext.pch" - AssemblerListingLocation=".\pd-msvc\tdl/" - ObjectFile=".\pd-msvc\tdl/" - ProgramDataBaseFileName=".\pd-msvc\tdl/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -87,10 +83,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\trl/flext.pch" - AssemblerListingLocation=".\pd-msvc\trl/" - ObjectFile=".\pd-msvc\trl/" - ProgramDataBaseFileName=".\pd-msvc\trl/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -139,10 +131,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\td/flext.pch" - AssemblerListingLocation=".\pd-msvc\td/" - ObjectFile=".\pd-msvc\td/" - ProgramDataBaseFileName=".\pd-msvc\td/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -193,10 +181,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\sd/flext.pch" - AssemblerListingLocation=".\pd-msvc\sd/" - ObjectFile=".\pd-msvc\sd/" - ProgramDataBaseFileName=".\pd-msvc\sd/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -249,10 +233,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\t/flext.pch" - AssemblerListingLocation=".\pd-msvc\t/" - ObjectFile=".\pd-msvc\t/" - ProgramDataBaseFileName=".\pd-msvc\t/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -303,10 +283,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\s/flext.pch" - AssemblerListingLocation=".\pd-msvc\s/" - ObjectFile=".\pd-msvc\s/" - ProgramDataBaseFileName=".\pd-msvc\s/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -355,10 +331,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\tdl/flext.pch" - AssemblerListingLocation=".\pd-msvc\tdl/" - ObjectFile=".\pd-msvc\tdl/" - ProgramDataBaseFileName=".\pd-msvc\tdl/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -422,10 +394,6 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\tdl/flext.pch" - AssemblerListingLocation=".\pd-msvc\tdl/" - ObjectFile=".\pd-msvc\tdl/" - ProgramDataBaseFileName=".\pd-msvc\tdl/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -488,10 +456,6 @@ copy F:\prog\max\flext\pd-msvc\flext.dll f:\prog\dll RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\tdl/flext.pch" - AssemblerListingLocation=".\pd-msvc\tdl/" - ObjectFile=".\pd-msvc\tdl/" - ProgramDataBaseFileName=".\pd-msvc\tdl/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -555,10 +519,6 @@ copy F:\prog\max\flext\pd-msvc\flext.dll f:\prog\dll RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\tdl/flext.pch" - AssemblerListingLocation=".\pd-msvc\tdl/" - ObjectFile=".\pd-msvc\tdl/" - ProgramDataBaseFileName=".\pd-msvc\tdl/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -626,10 +586,6 @@ copy F:\prog\max\flext\max-msvc\flext.max.dll f:\prog\dll RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\tdl/flext.pch" - AssemblerListingLocation=".\pd-msvc\tdl/" - ObjectFile=".\pd-msvc\tdl/" - ProgramDataBaseFileName=".\pd-msvc\tdl/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -686,10 +642,6 @@ copy F:\prog\max\flext\max-msvc\flext.max.dll f:\prog\dll RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderThrough="flext.h" - PrecompiledHeaderFile=".\pd-msvc\tdl/flext.pch" - AssemblerListingLocation=".\pd-msvc\tdl/" - ObjectFile=".\pd-msvc\tdl/" - ProgramDataBaseFileName=".\pd-msvc\tdl/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -703,8 +655,7 @@ copy F:\prog\max\flext\max-msvc\flext.max.dll f:\prog\dll + Name="VCPostBuildEventTool"/> s_thing) { const _buffer *p = (const _buffer *)sym->s_thing; - if(NOGOOD(p)) { + if(NOGOOD(p) || !p->b_valid) { post("buffer: buffer object '%s' no good",GetString(sym)); - if(valid) ret = -1; + if(valid) ret = -2; } else { #ifdef FLEXT_DEBUG - post("flext: buffer object '%s' - valid:%i samples:%i channels:%i frames:%i",GetString(sym),p->b_valid,p->b_frames,p->b_nchans,p->b_frames); +// post("flext: buffer object '%s' - valid:%i samples:%i channels:%i frames:%i",GetString(sym),p->b_valid,p->b_frames,p->b_nchans,p->b_frames); #endif if(data != p->b_samples) { data = p->b_samples; if(!ret) ret = 1; } if(chns != p->b_nchans) { chns = p->b_nchans; if(!ret) ret = 1; } @@ -117,7 +117,7 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly) } else { FLEXT_LOG1("buffer: symbol '%s' not defined", GetString(sym)); - if(valid) ret = -1; + /*if(valid)*/ ret = -1; } #else #error not implemented diff --git a/externals/grill/flext/source/fldsp.cpp b/externals/grill/flext/source/fldsp.cpp index 9985464a..0161683c 100644 --- a/externals/grill/flext/source/fldsp.cpp +++ b/externals/grill/flext/source/fldsp.cpp @@ -115,8 +115,8 @@ t_int *flext_dsp::dspmeth(t_int *w) #else if(obj->dspon) #endif - obj->m_signal((int)w[2],obj->invecs,obj->outvecs); - return w+3; + obj->m_signal(obj->blksz,obj->invecs,obj->outvecs); + return w+2; } #endif @@ -186,12 +186,11 @@ void flext_dsp::cb_dsp(t_class *c,t_signal **sp) // set the DSP function #if FLEXT_SYS == FLEXT_SYS_JMAX - fts_atom_t args[2]; - fts_set_pointer(args+0,obj); - fts_set_int(args+1,obj->blksz); - fts_dsp_add_function(dspsym,2,args); + fts_atom_t args; + fts_set_pointer(args,obj); + fts_dsp_add_function(dspsym,1,args); #else - dsp_add((t_dspmethod)dspmeth,2,obj,obj->blksz); + dsp_add((t_dspmethod)dspmeth,1,obj); #endif } diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index ac875980..99938676 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -933,11 +933,11 @@ public: //! Clear timer. bool Reset(); //! Trigger a one shot at an absolute time. - bool At(double tm,void *data = NULL,bool dopast = true); + bool At(double time,void *data = NULL,bool dopast = true); //! Trigger a one shot interval. - bool Delay(double tm,void *data = NULL); + bool Delay(double time,void *data = NULL); //! Trigger a periodic interval. - bool Periodic(double tm,void *data = NULL); + bool Periodic(double time,void *data = NULL); //! Trigger immediately. bool Now(void *data = NULL) { return Delay(0,data); } diff --git a/externals/grill/py/py.vcproj b/externals/grill/py/py.vcproj index 2e0e2431..968b1407 100644 --- a/externals/grill/py/py.vcproj +++ b/externals/grill/py/py.vcproj @@ -13,7 +13,7 @@ @@ -178,7 +166,7 @@ Name="VCCustomBuildTool"/> @@ -244,7 +228,7 @@ Name="VCCustomBuildTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -320,119 +431,158 @@ + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + @@ -440,158 +590,210 @@ + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + @@ -599,41 +801,54 @@ + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + diff --git a/externals/grill/vasp/vasp.vcproj b/externals/grill/vasp/vasp.vcproj index 0723fa7f..bb36f9d9 100644 --- a/externals/grill/vasp/vasp.vcproj +++ b/externals/grill/vasp/vasp.vcproj @@ -13,7 +13,7 @@ @@ -251,12 +235,11 @@ Name="VCCustomBuildTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -314,40 +430,52 @@ + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + + + + AdditionalIncludeDirectories=""/> + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> @@ -1587,548 +2063,716 @@ + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + Name="PD Release|Win32"> + + + + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> + Name="PD Debug|Win32"> + Name="PD Threads Debug|Win32"> + Name="PD Threads Release|Win32"> + AdditionalIncludeDirectories=""/> + + + + Name="PD Shared Release|Win32"> + + + + BasicRuntimeChecks="3" + BrowseInformation="1"/> @@ -45,11 +41,11 @@ Name="VCCustomBuildTool"/> + + + + + + + + + + + + + + + @@ -180,7 +239,7 @@ + + + + + + + + + @@ -248,7 +331,7 @@ + Name="PD Release|Win32"> + Name="PD Debug|Win32"> + + + @@ -276,7 +367,7 @@ + Name="PD Release|Win32"> + Name="PD Debug|Win32"> + + + @@ -300,7 +399,7 @@ + Name="PD Release|Win32"> + Name="PD Debug|Win32"> + + + @@ -324,14 +431,21 @@ + Name="PD Release|Win32"> + + + + Name="PD Shared Release|Win32"> + Name="PD Release|Win32"> + Name="PD Debug|Win32"> + + + @@ -379,7 +501,7 @@ + Name="PD Release|Win32"> + Name="PD Debug|Win32"> + + + diff --git a/externals/grill/xsample/maxmsp/xgroove~.help b/externals/grill/xsample/maxmsp/xgroove~.help index 43df9d87..ff604245 100644 Binary files a/externals/grill/xsample/maxmsp/xgroove~.help and b/externals/grill/xsample/maxmsp/xgroove~.help differ diff --git a/externals/grill/xsample/source/inter.h b/externals/grill/xsample/source/inter.h index d5f2b4ac..e7f929e8 100755 --- a/externals/grill/xsample/source/inter.h +++ b/externals/grill/xsample/source/inter.h @@ -138,11 +138,14 @@ TMPLDEF V xinter::st_play4(const S *bdt,const I smin,const I smax,const I n,cons register const S *fa,*fb,*fc,*fd; if(oint <= smin) { + // if oint < first sample set it to first sample + // \TODO what about wraparound (in loop/palindrome mode) ? if(oint < smin) oint = smin,o = (float)smin; - fa = bdt+smin*BCHNS; // position is first sample + // position is first sample + fa = bdt+smin*BCHNS; + fb = bdt+oint*BCHNS; - frac = o-oint; fc = fb+BCHNS; fd = fc+BCHNS; @@ -152,11 +155,11 @@ TMPLDEF V xinter::st_play4(const S *bdt,const I smin,const I smax,const I n,cons frac = o-oint; fb = bdt+oint*BCHNS; - fa = fb-BCHNS; // CACHE! + fa = fb-BCHNS; - // \TODO what about wrap-around??? - fc = fb >= maxp?maxp:fb+BCHNS; // ev. CACHE! - fd = fc >= maxp?maxp:fc+BCHNS; // ev. CACHE! + // \TODO what about wraparound (in loop/palindrome mode) ? + fc = fb >= maxp?maxp:fb+BCHNS; + fd = fc >= maxp?maxp:fc+BCHNS; } else { fa = bdt+oint*BCHNS-BCHNS; diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h index 61c0bf4d..e174915b 100644 --- a/externals/grill/xsample/source/main.h +++ b/externals/grill/xsample/source/main.h @@ -12,7 +12,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #define __XSAMPLE_H -#define XSAMPLE_VERSION "0.3.0pre13" +#define XSAMPLE_VERSION "0.3.0pre14" #define FLEXT_ATTRIBUTES 1 @@ -41,7 +41,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif #elif defined(__MWERKS__) // CodeWarrior <= 8 can't take address of a template member function - #ifndef FEXLT_DEBUG + #ifndef FLEXT_DEBUG #define TMPLOPT #endif // #define SIGSTATIC // define that for CW6 @@ -72,6 +72,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #define STD #endif + #ifdef __ALTIVEC__ #if FLEXT_CPU == FLEXT_CPU_PPC && defined(__MWERKS__) #pragma altivec_model on @@ -95,6 +96,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. } #endif + class xsample: public flext_dsp { diff --git a/externals/grill/xsample/xsample.vcproj b/externals/grill/xsample/xsample.vcproj index 8e61f58e..5565878f 100644 --- a/externals/grill/xsample/xsample.vcproj +++ b/externals/grill/xsample/xsample.vcproj @@ -32,10 +32,6 @@ EnableFunctionLevelLinking="TRUE" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\pd-msvc\r/xsample.pch" - AssemblerListingLocation=".\pd-msvc\r/" - ObjectFile=".\pd-msvc\r/" - ProgramDataBaseFileName=".\pd-msvc\r/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -48,7 +44,6 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="c:\programme\audio\pd\bin,..\flext\pd-msvc\" - ProgramDatabaseFile=".\pd-msvc\r/xsample.pdb" ImportLibrary=".\pd-msvc\r/xsample.lib" TargetMachine="1"/> @@ -183,7 +169,6 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="f:\prog\pd\pd-cvs\bin;..\flext\pd-msvc" - ProgramDatabaseFile=".\pd-msvc\r/xsample.pdb" ImportLibrary=".\pd-msvc\s/xsample.lib" TargetMachine="1"/> @@ -250,7 +231,6 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release";"F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release";..\flext\max-msvc" - ProgramDatabaseFile=".\max-msvc\d/xsample.pdb" ImportLibrary=".\max-msvc\d/xsample.lib" TargetMachine="1"/>