/[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 3580 by schoenebeck, Sat Aug 24 09:18:57 2019 UTC revision 3581 by schoenebeck, Fri Aug 30 11:40:25 2019 UTC
# Line 500  namespace LinuxSampler { Line 500  namespace LinuxSampler {
500      }      }
501    
502      VMFnResult* InstrumentScriptVMFunction_change_tune::exec(VMFnArgs* args) {      VMFnResult* InstrumentScriptVMFunction_change_tune::exec(VMFnArgs* args) {
503          MetricPrefix_t prefix = args->arg(1)->asInt()->unitPrefix(0);          bool bUnitFactor = args->arg(1)->asInt()->hasUnitFactorNow();
504          vmint tune     = (prefix) ? args->arg(1)->asInt()->evalInt(VM_MILLI,VM_CENTI)          vmint tune       = (bUnitFactor) ? args->arg(1)->asInt()->evalInt(VM_MILLI,VM_CENTI)
505                                    : args->arg(1)->asInt()->evalInt(); // tuning change in milli cents                                           : args->arg(1)->asInt()->evalInt(); // tuning change in milli cents
506          bool isFinal   = args->arg(1)->asInt()->isFinal();          bool isFinal   = args->arg(1)->asInt()->isFinal();
507          StdUnit_t unit = args->arg(1)->asInt()->unitType();          StdUnit_t unit = args->arg(1)->asInt()->unitType();
508          bool relative = (args->argsCount() >= 3) ? (args->arg(2)->asInt()->evalInt() & 1) : false;          bool relative = (args->argsCount() >= 3) ? (args->arg(2)->asInt()->evalInt() & 1) : false;
# Line 1309  namespace LinuxSampler { Line 1309  namespace LinuxSampler {
1309          const StdUnit_t unit = args->arg(1)->asInt()->unitType();          const StdUnit_t unit = args->arg(1)->asInt()->unitType();
1310          const bool isFinal   = args->arg(1)->asInt()->isFinal();          const bool isFinal   = args->arg(1)->asInt()->isFinal();
1311          vmint value =          vmint value =
1312              (m_acceptUnitPrefix && ((m_unit && unit) || (!m_unit && args->arg(1)->asInt()->unitPrefix(0))))              (m_acceptUnitPrefix && ((m_unit && unit) || (!m_unit && args->arg(1)->asInt()->hasUnitFactorNow())))
1313                  ? args->arg(1)->asInt()->evalInt(T_unitPrefix0, T_unitPrefixN ...)                  ? args->arg(1)->asInt()->evalInt(T_unitPrefix0, T_unitPrefixN ...)
1314                  : args->arg(1)->asInt()->evalInt();                  : args->arg(1)->asInt()->evalInt();
1315    
Legend:
Removed from v.3580  
changed lines
  Added in v.3581
  ViewVC Help
Powered by ViewVC