diff options
Diffstat (limited to 'externals/grill/vasp/source')
-rw-r--r-- | externals/grill/vasp/source/buflib.cpp | 11 | ||||
-rw-r--r-- | externals/grill/vasp/source/main.cpp | 2 | ||||
-rw-r--r-- | externals/grill/vasp/source/vbuffer.h | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/externals/grill/vasp/source/buflib.cpp b/externals/grill/vasp/source/buflib.cpp index 938a1969..b1a9054e 100644 --- a/externals/grill/vasp/source/buflib.cpp +++ b/externals/grill/vasp/source/buflib.cpp @@ -157,8 +157,8 @@ static V LibThr(flext::thr_params *) { flext::RelPriority(-2); - while(libthrexit) { - libthrcond->TimedWait(0.5f); + while(!libthrexit) { + libthrcond->TimedWait(1); // don't go below 1 here as TimedWait might not support fractions of seconds!!! // TODO - should process return value of TimedWait Collect(); } @@ -286,7 +286,12 @@ ImmBuf::ImmBuf(I len): ImmBuf::ImmBuf(BufEntry *e,I len,I offs): VBuffer(0,len,offs), entry(e) -{} +{ + if(Length() > e->alloc) { + Length(e->alloc); + post("vasp - buffer %s: Length (%i) is out of range, corrected to %i",GetString(e->sym),len,e->alloc); + } +} VSymbol ImmBuf::Symbol() const { return entry->sym; } diff --git a/externals/grill/vasp/source/main.cpp b/externals/grill/vasp/source/main.cpp index 83e4b4aa..282ff990 100644 --- a/externals/grill/vasp/source/main.cpp +++ b/externals/grill/vasp/source/main.cpp @@ -12,7 +12,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "classes.h" -const C *VASP_VERSION = "0.1.2pre7"; +const C *VASP_VERSION = "0.1.2pre8"; V lib_setup() { diff --git a/externals/grill/vasp/source/vbuffer.h b/externals/grill/vasp/source/vbuffer.h index 5233f580..01a57af0 100644 --- a/externals/grill/vasp/source/vbuffer.h +++ b/externals/grill/vasp/source/vbuffer.h @@ -13,7 +13,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "main.h" -class VSymbol +class VSymbol: + public flext { public: VSymbol(const t_symbol *s = NULL): sym(s) { Inc(); } @@ -38,7 +39,8 @@ protected: const t_symbol *sym; }; -class VBuffer +class VBuffer: + public flext { public: virtual ~VBuffer() {} |