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

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

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

revision 3216 by schoenebeck, Thu May 25 15:16:28 2017 UTC revision 3218 by schoenebeck, Thu May 25 16:32:17 2017 UTC
# Line 385  namespace LinuxSampler { Line 385  namespace LinuxSampler {
385              if (!pNote) return successResult();              if (!pNote) return successResult();
386    
387              // if change_vol() was called immediately after note was triggered              // if change_vol() was called immediately after note was triggered
388              // then immediately apply the volume to note object              // then immediately apply the volume to note object, but only if
389              if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime) {              // change_vol_time() has not been called before
390                if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime &&
391                    pNote->Override.VolumeTime <= DEFAULT_NOTE_VOLUME_TIME_S)
392                {
393                  if (relative)                  if (relative)
394                      pNote->Override.Volume *= fVolumeLin;                      pNote->Override.Volume *= fVolumeLin;
395                  else                  else
# Line 412  namespace LinuxSampler { Line 415  namespace LinuxSampler {
415                  if (!pNote) continue;                  if (!pNote) continue;
416    
417                  // if change_vol() was called immediately after note was triggered                  // if change_vol() was called immediately after note was triggered
418                  // then immediately apply the volume to Note object                  // then immediately apply the volume to Note object, but only if
419                  if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime) {                  // change_vol_time() has not been called before
420                    if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime &&
421                        pNote->Override.VolumeTime <= DEFAULT_NOTE_VOLUME_TIME_S)
422                    {
423                      if (relative)                      if (relative)
424                          pNote->Override.Volume *= fVolumeLin;                          pNote->Override.Volume *= fVolumeLin;
425                      else                      else
# Line 472  namespace LinuxSampler { Line 478  namespace LinuxSampler {
478              if (!pNote) return successResult();              if (!pNote) return successResult();
479    
480              // if change_tune() was called immediately after note was triggered              // if change_tune() was called immediately after note was triggered
481              // then immediately apply the tuning to Note object              // then immediately apply the tuning to Note object, but only if
482              if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime) {              // change_tune_time() has not been called before
483                if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime &&
484                    pNote->Override.PitchTime <= DEFAULT_NOTE_PITCH_TIME_S)
485                {
486                  if (relative)                  if (relative)
487                      pNote->Override.Pitch *= fFreqRatio;                      pNote->Override.Pitch *= fFreqRatio;
488                  else                  else
# Line 499  namespace LinuxSampler { Line 508  namespace LinuxSampler {
508                  if (!pNote) continue;                  if (!pNote) continue;
509    
510                  // if change_tune() was called immediately after note was triggered                  // if change_tune() was called immediately after note was triggered
511                  // then immediately apply the tuning to Note object                  // then immediately apply the tuning to Note object, but only if
512                  if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime) {                  // change_tune_time() has not been called before
513                    if (m_vm->m_event->scheduleTime == pNote->triggerSchedTime &&
514                        pNote->Override.PitchTime <= DEFAULT_NOTE_PITCH_TIME_S)
515                    {
516                      if (relative)                      if (relative)
517                          pNote->Override.Pitch *= fFreqRatio;                          pNote->Override.Pitch *= fFreqRatio;
518                      else                      else
Legend:
Removed from v.3216  
changed lines
  Added in v.3218
  ViewVC Help
Powered by ViewVC