/[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 3715 by schoenebeck, Sun Jan 12 17:07:34 2020 UTC revision 3742 by schoenebeck, Fri Feb 14 15:15:13 2020 UTC
# Line 1215  namespace LinuxSampler { Line 1215  namespace LinuxSampler {
1215              attack = 0;              attack = 0;
1216          }          }
1217          const float fAttack =          const float fAttack =
1218              (unit) ? attack : float(attack) / float(VM_EG_PAR_MAX_VALUE);              (unit) ?
1219                    float(attack) / 1000000.f /* us -> s */ :
1220                    float(attack) / float(VM_EG_PAR_MAX_VALUE);
1221    
1222          AbstractEngineChannel* pEngineChannel =          AbstractEngineChannel* pEngineChannel =
1223              static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);              static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);
# Line 1345  namespace LinuxSampler { Line 1347  namespace LinuxSampler {
1347              decay = 0;              decay = 0;
1348          }          }
1349          const float fDecay =          const float fDecay =
1350              (unit) ? decay : float(decay) / float(VM_EG_PAR_MAX_VALUE);              (unit) ?
1351                    float(decay) / 1000000.f /* us -> s */ :
1352                    float(decay) / float(VM_EG_PAR_MAX_VALUE);
1353    
1354          AbstractEngineChannel* pEngineChannel =          AbstractEngineChannel* pEngineChannel =
1355              static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);              static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);
# Line 1475  namespace LinuxSampler { Line 1479  namespace LinuxSampler {
1479              release = 0;              release = 0;
1480          }          }
1481          const float fRelease =          const float fRelease =
1482              (unit) ? release : float(release) / float(VM_EG_PAR_MAX_VALUE);              (unit) ?
1483                    float(release) / 1000000.f /* us -> s */ :
1484                    float(release) / float(VM_EG_PAR_MAX_VALUE);
1485    
1486          AbstractEngineChannel* pEngineChannel =          AbstractEngineChannel* pEngineChannel =
1487              static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);              static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);

Legend:
Removed from v.3715  
changed lines
  Added in v.3742

  ViewVC Help
Powered by ViewVC