- use jsy_min/jsy_max
- fixed includes - removed redundant MW table - added Missing JK_MidiClock
This commit is contained in:
@@ -555,7 +555,7 @@ VelKey_PopUp::VelKey_PopUp (JaySynthMidiCC *pMidiCC, int paramID, synth_float_t
|
||||
pMidiCC_container = pMidiCC->getAtParamID(m_paramID);
|
||||
paramInfoInit(&m_velKey_constraints, 0, pMidiCC->getConstraints(pMidiCC_container)->pName);
|
||||
paramInfoCopy(&m_velKey_constraints, pMidiCC->getConstraints(pMidiCC_container));
|
||||
m_velKey_constraints.pmax = max(fabs(pMidiCC->getConstraints(pMidiCC_container)->pmin), fabs(pMidiCC->getConstraints(pMidiCC_container)->pmax));
|
||||
m_velKey_constraints.pmax = jsy_max(fabs(pMidiCC->getConstraints(pMidiCC_container)->pmin), fabs(pMidiCC->getConstraints(pMidiCC_container)->pmax));
|
||||
m_velKey_constraints.pmin = -m_velKey_constraints.pmax;
|
||||
m_velKey_constraints.scenter = 0.5;
|
||||
m_velKey_constraints.pcenter = -1E18;
|
||||
@@ -580,15 +580,15 @@ VelKey_PopUp::VelKey_PopUp (JaySynthMidiCC *pMidiCC, int paramID, synth_float_t
|
||||
|
||||
m_label_prec = 3;
|
||||
if (pMidiCC->getConstraints(pMidiCC_container)->pinterval > 0)
|
||||
m_label_prec = max(1, (int)(-log(pMidiCC->getConstraints(pMidiCC_container)->pinterval)/log(10.0) + 0.5));
|
||||
m_label_prec = jsy_max(1, (int)(-log(pMidiCC->getConstraints(pMidiCC_container)->pinterval)/log(10.0) + 0.5));
|
||||
|
||||
m_label_shape_prec = 3;
|
||||
if (m_shape_xform.pinterval > 0)
|
||||
m_label_shape_prec = max(1, (int)(-log(m_shape_xform.pinterval)/log(10.0) + 0.5));
|
||||
m_label_shape_prec = jsy_max(1, (int)(-log(m_shape_xform.pinterval)/log(10.0) + 0.5));
|
||||
|
||||
m_label_skew_prec = 3;
|
||||
if (m_skew_xform.pinterval > 0)
|
||||
m_label_skew_prec = max(1, (int)(-log(m_skew_xform.pinterval)/log(10.0) + 0.5));
|
||||
m_label_skew_prec = jsy_max(1, (int)(-log(m_skew_xform.pinterval)/log(10.0) + 0.5));
|
||||
|
||||
displayUpdate();
|
||||
//[/Constructor]
|
||||
|
||||
Reference in New Issue
Block a user