/[svn]/linuxsampler/trunk/src/scriptvm/ScriptVM.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/scriptvm/ScriptVM.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3260 by schoenebeck, Wed May 31 21:07:44 2017 UTC revision 3311 by schoenebeck, Sat Jul 15 16:24:59 2017 UTC
# Line 293  namespace LinuxSampler { Line 293  namespace LinuxSampler {
293          return NULL;          return NULL;
294      }      }
295    
296        bool ScriptVM::isFunctionDisabled(VMFunction* fn, VMParserContext* ctx) {
297            ParserContext* parserCtx = dynamic_cast<ParserContext*>(ctx);
298            if (!parserCtx) return false;
299    
300            if (fn == m_fnMessage && parserCtx->userPreprocessorConditions.count("NKSP_NO_MESSAGE"))
301                return true;
302    
303            return false;
304        }
305    
306      std::map<String,VMIntRelPtr*> ScriptVM::builtInIntVariables() {      std::map<String,VMIntRelPtr*> ScriptVM::builtInIntVariables() {
307          return std::map<String,VMIntRelPtr*>();          return std::map<String,VMIntRelPtr*>();
308      }      }
# Line 366  namespace LinuxSampler { Line 376  namespace LinuxSampler {
376    
377          ctx->status = VM_EXEC_RUNNING;          ctx->status = VM_EXEC_RUNNING;
378          ctx->instructionsCount = 0;          ctx->instructionsCount = 0;
379          StmtFlags_t flags = STMT_SUCCESS;          StmtFlags_t& flags = ctx->flags;
380          int instructionsCounter = 0;          int instructionsCounter = 0;
381          int synced = m_autoSuspend ? 0 : 1;          int synced = m_autoSuspend ? 0 : 1;
382    
# Line 484  namespace LinuxSampler { Line 494  namespace LinuxSampler {
494              ++instructionsCounter;              ++instructionsCounter;
495          }          }
496    
497          if (flags & STMT_SUSPEND_SIGNALLED) {          if ((flags & STMT_SUSPEND_SIGNALLED) && !(flags & STMT_ABORT_SIGNALLED)) {
498              ctx->status = VM_EXEC_SUSPENDED;              ctx->status = VM_EXEC_SUSPENDED;
499                ctx->flags  = STMT_SUCCESS;
500          } else {          } else {
501              ctx->status = VM_EXEC_NOT_RUNNING;              ctx->status = VM_EXEC_NOT_RUNNING;
502              if (flags & STMT_ERROR_OCCURRED)              if (flags & STMT_ERROR_OCCURRED)
Legend:
Removed from v.3260  
changed lines
  Added in v.3311
  ViewVC Help
Powered by ViewVC