/[svn]/linuxsampler/trunk/src/engines/common/InstrumentScriptVM.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/common/InstrumentScriptVM.cpp

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

revision 3035 by schoenebeck, Mon Oct 31 12:00:00 2016 UTC revision 3802 by schoenebeck, Fri Jul 31 15:07:04 2020 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (c) 2014 - 2016 Christian Schoenebeck   * Copyright (c) 2014 - 2020 Christian Schoenebeck
3   *   *
4   * http://www.linuxsampler.org   * http://www.linuxsampler.org
5   *   *
# Line 13  Line 13 
13  #include "../../common/global_private.h"  #include "../../common/global_private.h"
14  #include "AbstractInstrumentManager.h"  #include "AbstractInstrumentManager.h"
15  #include "MidiKeyboardManager.h"  #include "MidiKeyboardManager.h"
16    #include "Fade.h"
17    
18  namespace LinuxSampler {  namespace LinuxSampler {
19    
20      ///////////////////////////////////////////////////////////////////////      ///////////////////////////////////////////////////////////////////////
21      // class 'EventGroup'      // class 'EventGroup'
22    
23      void EventGroup::insert(int eventID) {      void EventGroup::insert(vmint eventID) {
24          if (contains(eventID)) return;          if (contains(eventID)) return;
25    
26          AbstractEngine* pEngine = m_script->pEngineChannel->pEngine;          AbstractEngine* pEngine = m_script->pEngineChannel->pEngine;
# Line 30  namespace LinuxSampler { Line 31  namespace LinuxSampler {
31          // events die before being removed explicitly from the group by script          // events die before being removed explicitly from the group by script
32          //          //
33          // NOTE: or should we do this "dead ones" check only once in a while?          // NOTE: or should we do this "dead ones" check only once in a while?
34          int firstDead = -1;          ssize_t firstDead = -1;
35          for (int i = 0; i < size(); ++i) {          for (size_t i = 0; i < size(); ++i) {
36              if (firstDead >= 0) {              if (firstDead >= 0) {
37                  if (pEngine->EventByID(eventID)) {                  if (pEngine->EventByID(eventID)) {
38                      remove(firstDead, i - firstDead);                      remove(firstDead, i - firstDead);
# Line 45  namespace LinuxSampler { Line 46  namespace LinuxSampler {
46          append(eventID);          append(eventID);
47      }      }
48    
49      void EventGroup::erase(int eventID) {      void EventGroup::erase(vmint eventID) {
50          int index = find(eventID);          size_t index = find(eventID);
51          remove(index);          remove(index);
52      }      }
53    
# Line 60  namespace LinuxSampler { Line 61  namespace LinuxSampler {
61          handlerNote = NULL;          handlerNote = NULL;
62          handlerRelease = NULL;          handlerRelease = NULL;
63          handlerController = NULL;          handlerController = NULL;
64            handlerRpn = NULL;
65            handlerNrpn = NULL;
66          pEvents = NULL;          pEvents = NULL;
67          for (int i = 0; i < 128; ++i)          for (int i = 0; i < 128; ++i)
68              pKeyEvents[i] = NULL;              pKeyEvents[i] = NULL;
# Line 85  namespace LinuxSampler { Line 88  namespace LinuxSampler {
88       * channels.       * channels.
89       *       *
90       * @param text - source code of script       * @param text - source code of script
91         * @param patchVars - 'patch' variables being overridden by instrument
92       */       */
93      void InstrumentScript::load(const String& text) {      void InstrumentScript::load(const String& text,
94                                    const std::map<String,String>& patchVars)
95        {
96          dmsg(1,("Loading real-time instrument script ... "));          dmsg(1,("Loading real-time instrument script ... "));
97    
98          // hand back old script reference and VM execution contexts          // hand back old script reference and VM execution contexts
# Line 99  namespace LinuxSampler { Line 105  namespace LinuxSampler {
105              dynamic_cast<AbstractInstrumentManager*>(pEngineChannel->pEngine->GetInstrumentManager());              dynamic_cast<AbstractInstrumentManager*>(pEngineChannel->pEngine->GetInstrumentManager());
106    
107          // get new script reference          // get new script reference
108          parserContext = pManager->scripts.Borrow(text, pEngineChannel);          parserContext = pManager->scripts.Borrow(
109                { .code = text, .patchVars = patchVars }, pEngineChannel
110            );
111          if (!parserContext->errors().empty()) {          if (!parserContext->errors().empty()) {
112              std::vector<ParserIssue> errors = parserContext->errors();              std::vector<ParserIssue> errors = parserContext->errors();
113              std::cerr << "[ScriptVM] Could not load instrument script, there were "              std::cerr << "[ScriptVM] Could not load instrument script, there were "
# Line 113  namespace LinuxSampler { Line 121  namespace LinuxSampler {
121          handlerNote = parserContext->eventHandlerByName("note");          handlerNote = parserContext->eventHandlerByName("note");
122          handlerRelease = parserContext->eventHandlerByName("release");          handlerRelease = parserContext->eventHandlerByName("release");
123          handlerController = parserContext->eventHandlerByName("controller");          handlerController = parserContext->eventHandlerByName("controller");
124            handlerRpn = parserContext->eventHandlerByName("rpn");
125            handlerNrpn = parserContext->eventHandlerByName("nrpn");
126          bHasValidScript =          bHasValidScript =
127              handlerInit || handlerNote || handlerRelease || handlerController;              handlerInit || handlerNote || handlerRelease || handlerController ||
128                handlerRpn || handlerNrpn;
129    
130          // amount of script handlers each script event has to execute          // amount of script handlers each script event has to execute
131          int handlerExecCount = 0;          int handlerExecCount = 0;
132          if (handlerNote || handlerRelease || handlerController) // only one of these are executed after "init" handler          if (handlerNote || handlerRelease || handlerController || handlerRpn ||
133                handlerNrpn) // only one of these are executed after "init" handler
134              handlerExecCount++;              handlerExecCount++;
135    
136          // create script event pool (if it doesn't exist already)          // create script event pool (if it doesn't exist already)
# Line 132  namespace LinuxSampler { Line 144  namespace LinuxSampler {
144                  RTList<ScriptEvent>::Iterator it = pEvents->allocAppend();                  RTList<ScriptEvent>::Iterator it = pEvents->allocAppend();
145                  it->reset();                  it->reset();
146              }              }
             pEvents->clear();  
147          }          }
148            pEvents->clear(); // outside of upper block, as loop below must always start from cleared list
149    
150          // create new VM execution contexts for new script          // create new VM execution contexts for new script
151          while (!pEvents->poolIsEmpty()) {          while (!pEvents->poolIsEmpty()) {
# Line 172  namespace LinuxSampler { Line 184  namespace LinuxSampler {
184              pEvents->clear();              pEvents->clear();
185              while (!pEvents->poolIsEmpty()) {              while (!pEvents->poolIsEmpty()) {
186                  RTList<ScriptEvent>::Iterator it = pEvents->allocAppend();                  RTList<ScriptEvent>::Iterator it = pEvents->allocAppend();
187                    if (!it) break;
188                  if (it->execCtx) {                  if (it->execCtx) {
189                      // free VM execution context object                      // free VM execution context object
190                      delete it->execCtx;                      delete it->execCtx;
191                      it->execCtx = NULL;                      it->execCtx = NULL;
192                      // free C array of handler pointers                      // free C array of handler pointers
193                      delete [] it->handlers;                      delete [] it->handlers;
194                        it->handlers = NULL;
195                  }                  }
196              }              }
197              pEvents->clear();              pEvents->clear();
# Line 193  namespace LinuxSampler { Line 207  namespace LinuxSampler {
207              handlerNote = NULL;              handlerNote = NULL;
208              handlerRelease = NULL;              handlerRelease = NULL;
209              handlerController = NULL;              handlerController = NULL;
210                handlerRpn = NULL;
211                handlerNrpn = NULL;
212          }          }
213          bHasValidScript = false;          bHasValidScript = false;
214      }      }
# Line 228  namespace LinuxSampler { Line 244  namespace LinuxSampler {
244    
245      InstrumentScriptVM::InstrumentScriptVM() :      InstrumentScriptVM::InstrumentScriptVM() :
246          m_event(NULL), m_fnPlayNote(this), m_fnSetController(this),          m_event(NULL), m_fnPlayNote(this), m_fnSetController(this),
247            m_fnSetRpn(this), m_fnSetNrpn(this),
248          m_fnIgnoreEvent(this), m_fnIgnoreController(this), m_fnNoteOff(this),          m_fnIgnoreEvent(this), m_fnIgnoreController(this), m_fnNoteOff(this),
249          m_fnSetEventMark(this), m_fnDeleteEventMark(this), m_fnByMarks(this),          m_fnSetEventMark(this), m_fnDeleteEventMark(this), m_fnByMarks(this),
250          m_fnChangeVol(this), m_fnChangeTune(this), m_fnChangePan(this),          m_fnChangeVol(this), m_fnChangeVolTime(this),
251            m_fnChangeTune(this), m_fnChangeTuneTime(this), m_fnChangePan(this),
252            m_fnChangePanTime(this), m_fnChangePanCurve(this),
253          m_fnChangeCutoff(this), m_fnChangeReso(this),  m_fnChangeAttack(this),          m_fnChangeCutoff(this), m_fnChangeReso(this),  m_fnChangeAttack(this),
254          m_fnChangeDecay(this), m_fnChangeRelease(this), m_fnEventStatus(this),          m_fnChangeDecay(this), m_fnChangeSustain(this), m_fnChangeRelease(this),
255          m_fnWait2(this), m_fnStopWait(this),          m_fnChangeCutoffAttack(this), m_fnChangeCutoffDecay(this),
256          m_varEngineUptime(this), m_varCallbackID(this)          m_fnChangeCutoffSustain(this), m_fnChangeCutoffRelease(this),
257            m_fnChangeAmpLFODepth(this), m_fnChangeAmpLFOFreq(this),
258            m_fnChangeCutoffLFODepth(this), m_fnChangeCutoffLFOFreq(this),
259            m_fnChangePitchLFODepth(this), m_fnChangePitchLFOFreq(this),
260            m_fnChangeNote(this), m_fnChangeVelo(this), m_fnFork(this),
261            m_fnEventStatus(this), m_fnWait2(this), m_fnStopWait(this),
262            m_fnAbort(this), m_fnFadeIn(this), m_fnFadeOut(this),
263            m_fnChangeVolCurve(this), m_fnChangeTuneCurve(this),
264            m_fnGetEventPar(this), m_fnSetEventPar(this), m_fnChangePlayPos(this),
265            m_fnCallbackStatus(this),
266            m_varEngineUptime(this), m_varCallbackID(this), m_varAllEvents(this),
267            m_varCallbackChildID(this)
268      {      {
269          m_CC.size = _MEMBER_SIZEOF(AbstractEngineChannel, ControllerTable);          m_CC.size = _MEMBER_SIZEOF(AbstractEngineChannel, ControllerTable);
270          m_CC_NUM = DECLARE_VMINT(m_event, class ScriptEvent, cause.Param.CC.Controller);          m_CC_NUM = DECLARE_VMINT(m_event, class ScriptEvent, cause.Param.CC.Controller);
271          m_EVENT_ID = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, id);          m_EVENT_ID = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, id);
272          m_EVENT_NOTE = DECLARE_VMINT(m_event, class ScriptEvent, cause.Param.Note.Key);          m_EVENT_NOTE = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, cause.Param.Note.Key);
273          m_EVENT_VELOCITY = DECLARE_VMINT(m_event, class ScriptEvent, cause.Param.Note.Velocity);          m_EVENT_VELOCITY = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, cause.Param.Note.Velocity);
274            m_RPN_ADDRESS = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, cause.Param.RPN.Parameter);
275            m_RPN_VALUE = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, cause.Param.RPN.Value);
276          m_KEY_DOWN.size = 128;          m_KEY_DOWN.size = 128;
277            m_KEY_DOWN.readonly = true;
278          m_NI_CALLBACK_TYPE = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, handlerType);          m_NI_CALLBACK_TYPE = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, handlerType);
279          m_NKSP_IGNORE_WAIT = DECLARE_VMINT(m_event, class ScriptEvent, ignoreAllWaitCalls);          m_NKSP_IGNORE_WAIT = DECLARE_VMINT(m_event, class ScriptEvent, ignoreAllWaitCalls);
280            m_NKSP_CALLBACK_PARENT_ID = DECLARE_VMINT_READONLY(m_event, class ScriptEvent, parentHandlerID);
281      }      }
282    
283      VMExecStatus_t InstrumentScriptVM::exec(VMParserContext* parserCtx, ScriptEvent* event) {      VMExecStatus_t InstrumentScriptVM::exec(VMParserContext* parserCtx, ScriptEvent* event) {
# Line 273  namespace LinuxSampler { Line 307  namespace LinuxSampler {
307                      pEngineChannel->ControllerTable[CTRL_TABLE_IDX_PITCHBEND] =                      pEngineChannel->ControllerTable[CTRL_TABLE_IDX_PITCHBEND] =
308                          event->cause.Param.Pitch.Pitch;                          event->cause.Param.Pitch.Pitch;
309                      break;                      break;
310                    default:
311                        ; // noop
312              }              }
313          }          }
314    
# Line 283  namespace LinuxSampler { Line 319  namespace LinuxSampler {
319                  parserCtx, event->execCtx, event->handlers[event->currentHandler]                  parserCtx, event->execCtx, event->handlers[event->currentHandler]
320              );              );
321              event->executionSlices++;              event->executionSlices++;
322                if (!(res & VM_EXEC_SUSPENDED)) { // if script terminated ...
323                    // check if this script handler instance has any forked children
324                    // to be auto aborted
325                    for (int iChild = 0; iChild < MAX_FORK_PER_SCRIPT_HANDLER &&
326                         event->childHandlerID[iChild]; ++iChild)
327                    {
328                        RTList<ScriptEvent>::Iterator itChild =
329                            pEngineChannel->ScriptCallbackByID(event->childHandlerID[iChild]);
330                        if (itChild && itChild->autoAbortByParent)
331                            itChild->execCtx->signalAbort();
332                    }
333                }
334              if (res & VM_EXEC_SUSPENDED || res & VM_EXEC_ERROR) return res;              if (res & VM_EXEC_SUSPENDED || res & VM_EXEC_ERROR) return res;
335          }          }
336    
337          return res;          return res;
338      }      }
339    
340      std::map<String,VMIntRelPtr*> InstrumentScriptVM::builtInIntVariables() {      std::map<String,VMIntPtr*> InstrumentScriptVM::builtInIntVariables() {
341          // first get built-in integer variables of derived VM class          // first get built-in integer variables of derived VM class
342          std::map<String,VMIntRelPtr*> m = ScriptVM::builtInIntVariables();          std::map<String,VMIntPtr*> m = ScriptVM::builtInIntVariables();
343    
344          // now add own built-in variables          // now add own built-in variables
345          m["$CC_NUM"] = &m_CC_NUM;          m["$CC_NUM"] = &m_CC_NUM;
# Line 299  namespace LinuxSampler { Line 347  namespace LinuxSampler {
347          m["$EVENT_NOTE"] = &m_EVENT_NOTE;          m["$EVENT_NOTE"] = &m_EVENT_NOTE;
348          m["$EVENT_VELOCITY"] = &m_EVENT_VELOCITY;          m["$EVENT_VELOCITY"] = &m_EVENT_VELOCITY;
349  //         m["$POLY_AT_NUM"] = &m_POLY_AT_NUM;  //         m["$POLY_AT_NUM"] = &m_POLY_AT_NUM;
350            m["$RPN_ADDRESS"] = &m_RPN_ADDRESS; // used for both RPN and NRPN events
351            m["$RPN_VALUE"] = &m_RPN_VALUE;     // used for both RPN and NRPN events
352          m["$NI_CALLBACK_TYPE"] = &m_NI_CALLBACK_TYPE;          m["$NI_CALLBACK_TYPE"] = &m_NI_CALLBACK_TYPE;
353          m["$NKSP_IGNORE_WAIT"] = &m_NKSP_IGNORE_WAIT;          m["$NKSP_IGNORE_WAIT"] = &m_NKSP_IGNORE_WAIT;
354            m["$NKSP_CALLBACK_PARENT_ID"] = &m_NKSP_CALLBACK_PARENT_ID;
355    
356          return m;          return m;
357      }      }
# Line 317  namespace LinuxSampler { Line 368  namespace LinuxSampler {
368          return m;          return m;
369      }      }
370    
371      std::map<String,int> InstrumentScriptVM::builtInConstIntVariables() {      std::map<String,vmint> InstrumentScriptVM::builtInConstIntVariables() {
372          // first get built-in integer variables of derived VM class          // first get built-in integer variables of derived VM class
373          std::map<String,int> m = ScriptVM::builtInConstIntVariables();          std::map<String,vmint> m = ScriptVM::builtInConstIntVariables();
374    
375          m["$EVENT_STATUS_INACTIVE"] = EVENT_STATUS_INACTIVE;          m["$EVENT_STATUS_INACTIVE"] = EVENT_STATUS_INACTIVE;
376          m["$EVENT_STATUS_NOTE_QUEUE"] = EVENT_STATUS_NOTE_QUEUE;          m["$EVENT_STATUS_NOTE_QUEUE"] = EVENT_STATUS_NOTE_QUEUE;
# Line 328  namespace LinuxSampler { Line 379  namespace LinuxSampler {
379          for (int i = 0; i < INSTR_SCRIPT_EVENT_GROUPS; ++i) {          for (int i = 0; i < INSTR_SCRIPT_EVENT_GROUPS; ++i) {
380              m["$MARK_" + ToString(i+1)] = i;              m["$MARK_" + ToString(i+1)] = i;
381          }          }
382            m["$EVENT_PAR_NOTE"] = EVENT_PAR_NOTE;
383            m["$EVENT_PAR_VELOCITY"] = EVENT_PAR_VELOCITY;
384            m["$EVENT_PAR_VOLUME"] = EVENT_PAR_VOLUME;
385            m["$EVENT_PAR_TUNE"] = EVENT_PAR_TUNE;
386            m["$EVENT_PAR_0"] = EVENT_PAR_0;
387            m["$EVENT_PAR_1"] = EVENT_PAR_1;
388            m["$EVENT_PAR_2"] = EVENT_PAR_2;
389            m["$EVENT_PAR_3"] = EVENT_PAR_3;
390            m["$NKSP_LINEAR"] = FADE_CURVE_LINEAR;
391            m["$NKSP_EASE_IN_EASE_OUT"] = FADE_CURVE_EASE_IN_EASE_OUT;
392            m["$CALLBACK_STATUS_TERMINATED"] = CALLBACK_STATUS_TERMINATED;
393            m["$CALLBACK_STATUS_QUEUE"]      = CALLBACK_STATUS_QUEUE;
394            m["$CALLBACK_STATUS_RUNNING"]    = CALLBACK_STATUS_RUNNING;
395    
396          return m;          return m;
397      }      }
# Line 336  namespace LinuxSampler { Line 400  namespace LinuxSampler {
400          // first get built-in dynamic variables of derived VM class          // first get built-in dynamic variables of derived VM class
401          std::map<String,VMDynVar*> m = ScriptVM::builtInDynamicVariables();          std::map<String,VMDynVar*> m = ScriptVM::builtInDynamicVariables();
402    
403            m["%ALL_EVENTS"] = &m_varAllEvents;
404          m["$ENGINE_UPTIME"] = &m_varEngineUptime;          m["$ENGINE_UPTIME"] = &m_varEngineUptime;
405          m["$NI_CALLBACK_ID"] = &m_varCallbackID;          m["$NI_CALLBACK_ID"] = &m_varCallbackID;
406            m["%NKSP_CALLBACK_CHILD_ID"] = &m_varCallbackChildID;
407    
408          return m;          return m;
409      }      }
# Line 346  namespace LinuxSampler { Line 412  namespace LinuxSampler {
412          // built-in script functions of this class          // built-in script functions of this class
413          if      (name == "play_note") return &m_fnPlayNote;          if      (name == "play_note") return &m_fnPlayNote;
414          else if (name == "set_controller") return &m_fnSetController;          else if (name == "set_controller") return &m_fnSetController;
415            else if (name == "set_rpn") return &m_fnSetRpn;
416            else if (name == "set_nrpn") return &m_fnSetNrpn;
417          else if (name == "ignore_event") return &m_fnIgnoreEvent;          else if (name == "ignore_event") return &m_fnIgnoreEvent;
418          else if (name == "ignore_controller") return &m_fnIgnoreController;          else if (name == "ignore_controller") return &m_fnIgnoreController;
419          else if (name == "note_off") return &m_fnNoteOff;          else if (name == "note_off") return &m_fnNoteOff;
# Line 353  namespace LinuxSampler { Line 421  namespace LinuxSampler {
421          else if (name == "delete_event_mark") return &m_fnDeleteEventMark;          else if (name == "delete_event_mark") return &m_fnDeleteEventMark;
422          else if (name == "by_marks") return &m_fnByMarks;          else if (name == "by_marks") return &m_fnByMarks;
423          else if (name == "change_vol") return &m_fnChangeVol;          else if (name == "change_vol") return &m_fnChangeVol;
424            else if (name == "change_vol_time") return &m_fnChangeVolTime;
425          else if (name == "change_tune") return &m_fnChangeTune;          else if (name == "change_tune") return &m_fnChangeTune;
426            else if (name == "change_tune_time") return &m_fnChangeTuneTime;
427            else if (name == "change_note") return &m_fnChangeNote;
428            else if (name == "change_velo") return &m_fnChangeVelo;
429          else if (name == "change_pan") return &m_fnChangePan;          else if (name == "change_pan") return &m_fnChangePan;
430            else if (name == "change_pan_time") return &m_fnChangePanTime;
431            else if (name == "change_pan_curve") return &m_fnChangePanCurve;
432          else if (name == "change_cutoff") return &m_fnChangeCutoff;          else if (name == "change_cutoff") return &m_fnChangeCutoff;
433          else if (name == "change_reso") return &m_fnChangeReso;          else if (name == "change_reso") return &m_fnChangeReso;
434          else if (name == "change_attack") return &m_fnChangeAttack;          else if (name == "change_attack") return &m_fnChangeAttack;
435          else if (name == "change_decay") return &m_fnChangeDecay;          else if (name == "change_decay") return &m_fnChangeDecay;
436            else if (name == "change_sustain") return &m_fnChangeSustain;
437          else if (name == "change_release") return &m_fnChangeRelease;          else if (name == "change_release") return &m_fnChangeRelease;
438            else if (name == "change_cutoff_attack") return &m_fnChangeCutoffAttack;
439            else if (name == "change_cutoff_decay") return &m_fnChangeCutoffDecay;
440            else if (name == "change_cutoff_sustain") return &m_fnChangeCutoffSustain;
441            else if (name == "change_cutoff_release") return &m_fnChangeCutoffRelease;
442            else if (name == "change_amp_lfo_depth") return &m_fnChangeAmpLFODepth;
443            else if (name == "change_amp_lfo_freq") return &m_fnChangeAmpLFOFreq;
444            else if (name == "change_cutoff_lfo_depth") return &m_fnChangeCutoffLFODepth;
445            else if (name == "change_cutoff_lfo_freq") return &m_fnChangeCutoffLFOFreq;
446            else if (name == "change_pitch_lfo_depth") return &m_fnChangePitchLFODepth;
447            else if (name == "change_pitch_lfo_freq") return &m_fnChangePitchLFOFreq;
448            else if (name == "fade_in") return &m_fnFadeIn;
449            else if (name == "fade_out") return &m_fnFadeOut;
450            else if (name == "change_vol_curve") return &m_fnChangeVolCurve;
451            else if (name == "change_tune_curve") return &m_fnChangeTuneCurve;
452            else if (name == "change_play_pos") return &m_fnChangePlayPos;
453            else if (name == "get_event_par") return &m_fnGetEventPar;
454            else if (name == "set_event_par") return &m_fnSetEventPar;
455          else if (name == "event_status") return &m_fnEventStatus;          else if (name == "event_status") return &m_fnEventStatus;
456          else if (name == "wait") return &m_fnWait2; // override wait() core implementation          else if (name == "wait") return &m_fnWait2; // override wait() core implementation
457          else if (name == "stop_wait") return &m_fnStopWait;          else if (name == "stop_wait") return &m_fnStopWait;
458            else if (name == "abort") return &m_fnAbort;
459            else if (name == "fork") return &m_fnFork;
460            else if (name == "callback_status") return &m_fnCallbackStatus;
461    
462          // built-in script functions of derived VM class          // built-in script functions of derived VM class
463          return ScriptVM::functionByName(name);          return ScriptVM::functionByName(name);

Legend:
Removed from v.3035  
changed lines
  Added in v.3802

  ViewVC Help
Powered by ViewVC