aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill/flext')
-rw-r--r--externals/grill/flext/flext.vcproj51
-rw-r--r--externals/grill/flext/source/flbuf.cpp8
-rw-r--r--externals/grill/flext/source/fldsp.cpp13
-rw-r--r--externals/grill/flext/source/flsupport.h6
4 files changed, 14 insertions, 64 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
<Tool
Name="VCMIDLTool"/>
<Tool
- Name="VCPostBuildEventTool"
- Description="copy flext to maestra"/>
+ Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
diff --git a/externals/grill/flext/source/flbuf.cpp b/externals/grill/flext/source/flbuf.cpp
index bb602779..e9c02a00 100644
--- a/externals/grill/flext/source/flbuf.cpp
+++ b/externals/grill/flext/source/flbuf.cpp
@@ -102,13 +102,13 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly)
if(sym->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); }
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 01:35:46 +0000