/[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 3192 by schoenebeck, Fri May 19 14:23:12 2017 UTC revision 3193 by schoenebeck, Sat May 20 12:28:57 2017 UTC
# Line 238  namespace LinuxSampler { Line 238  namespace LinuxSampler {
238          m_fnChangePitchLFODepth(this), m_fnChangePitchLFOFreq(this),          m_fnChangePitchLFODepth(this), m_fnChangePitchLFOFreq(this),
239          m_fnEventStatus(this), m_fnWait2(this), m_fnStopWait(this),          m_fnEventStatus(this), m_fnWait2(this), m_fnStopWait(this),
240          m_fnFadeIn(this), m_fnFadeOut(this),          m_fnFadeIn(this), m_fnFadeOut(this),
241            m_fnGetEventPar(this), m_fnSetEventPar(this),
242          m_varEngineUptime(this), m_varCallbackID(this), m_varAllEvents(this)          m_varEngineUptime(this), m_varCallbackID(this), m_varAllEvents(this)
243      {      {
244          m_CC.size = _MEMBER_SIZEOF(AbstractEngineChannel, ControllerTable);          m_CC.size = _MEMBER_SIZEOF(AbstractEngineChannel, ControllerTable);
# Line 334  namespace LinuxSampler { Line 335  namespace LinuxSampler {
335          for (int i = 0; i < INSTR_SCRIPT_EVENT_GROUPS; ++i) {          for (int i = 0; i < INSTR_SCRIPT_EVENT_GROUPS; ++i) {
336              m["$MARK_" + ToString(i+1)] = i;              m["$MARK_" + ToString(i+1)] = i;
337          }          }
338            m["$EVENT_PAR_NOTE"] = EVENT_PAR_NOTE;
339            m["$EVENT_PAR_VELOCITY"] = EVENT_PAR_VELOCITY;
340            m["$EVENT_PAR_VOLUME"] = EVENT_PAR_VOLUME;
341            m["$EVENT_PAR_TUNE"] = EVENT_PAR_TUNE;
342            m["$EVENT_PAR_0"] = EVENT_PAR_0;
343            m["$EVENT_PAR_1"] = EVENT_PAR_1;
344            m["$EVENT_PAR_2"] = EVENT_PAR_2;
345            m["$EVENT_PAR_3"] = EVENT_PAR_3;
346    
347          return m;          return m;
348      }      }
# Line 375  namespace LinuxSampler { Line 384  namespace LinuxSampler {
384          else if (name == "change_pitch_lfo_freq") return &m_fnChangePitchLFOFreq;          else if (name == "change_pitch_lfo_freq") return &m_fnChangePitchLFOFreq;
385          else if (name == "fade_in") return &m_fnFadeIn;          else if (name == "fade_in") return &m_fnFadeIn;
386          else if (name == "fade_out") return &m_fnFadeOut;          else if (name == "fade_out") return &m_fnFadeOut;
387            else if (name == "get_event_par") return &m_fnGetEventPar;
388            else if (name == "set_event_par") return &m_fnSetEventPar;
389          else if (name == "event_status") return &m_fnEventStatus;          else if (name == "event_status") return &m_fnEventStatus;
390          else if (name == "wait") return &m_fnWait2; // override wait() core implementation          else if (name == "wait") return &m_fnWait2; // override wait() core implementation
391          else if (name == "stop_wait") return &m_fnStopWait;          else if (name == "stop_wait") return &m_fnStopWait;

Legend:
Removed from v.3192  
changed lines
  Added in v.3193

  ViewVC Help
Powered by ViewVC