aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/xsample
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill/xsample')
-rw-r--r--externals/grill/xsample/maxmsp/xgroove~.helpbin7578 -> 7572 bytes
-rwxr-xr-xexternals/grill/xsample/source/inter.h15
-rw-r--r--externals/grill/xsample/source/main.h6
-rw-r--r--externals/grill/xsample/xsample.vcproj30
4 files changed, 15 insertions, 36 deletions
diff --git a/externals/grill/xsample/maxmsp/xgroove~.help b/externals/grill/xsample/maxmsp/xgroove~.help
index 43df9d87..ff604245 100644
--- a/externals/grill/xsample/maxmsp/xgroove~.help
+++ b/externals/grill/xsample/maxmsp/xgroove~.help
Binary files 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"/>
<Tool
@@ -97,10 +92,6 @@
BasicRuntimeChecks="3"
RuntimeLibrary="5"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\pd-msvc\d/xsample.pch"
- AssemblerListingLocation=".\pd-msvc\d/"
- ObjectFile=".\pd-msvc\d/"
- ProgramDataBaseFileName=".\pd-msvc\d/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
@@ -116,7 +107,6 @@
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="c:\programme\audio\pd\bin\,..\flext\pd-msvc\"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\pd-msvc\d/xsample.pdb"
ImportLibrary=".\pd-msvc\d/xsample.lib"
TargetMachine="1"/>
<Tool
@@ -167,10 +157,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
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"/>
@@ -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"/>
<Tool
@@ -217,8 +202,8 @@
</Configuration>
<Configuration
Name="Max Shared Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory=".\max-msvc\s"
+ IntermediateDirectory=".\max-msvc\s"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -234,10 +219,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
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"/>
@@ -250,7 +231,6 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release&quot;;..\flext\max-msvc"
- ProgramDatabaseFile=".\max-msvc\d/xsample.pdb"
ImportLibrary=".\max-msvc\d/xsample.lib"
TargetMachine="1"/>
<Tool
@@ -301,10 +281,6 @@
RuntimeLibrary="1"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\pd-msvc\r/xsample.pch"
- AssemblerListingLocation=".\pd-msvc\r/"
- ObjectFile=".\pd-msvc\r/"
- ProgramDataBaseFileName=".\pd-msvc\r/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -319,8 +295,6 @@
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\debug&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\debug&quot;;..\flext\max-msvc"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\pd-msvc\r/xsample.pdb"
- ImportLibrary=".\max-msvc\s/xsample.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 05:49:49 +0000