Merge origin with post take-seq-bldr updates to master.

This commit is contained in:
Kevin Larke 2015-02-25 10:47:17 -08:00
commit 7d55b16257

View File

@ -1332,7 +1332,7 @@ cmScRC_t _cmScParseFile( cmSc_t* p, cmCtx_t* ctx, const cmChar_t* fn )
bool pedalDnFl = d1 >= 64; bool pedalDnFl = d1 >= 64;
unsigned pedalIdx = d0 - pedalBaseMidiId; unsigned pedalIdx = d0 - pedalBaseMidiId;
assert( pedalBaseMidiId <= pedalIdx && pedalIdx < pedalN ); assert( pedalBaseMidiId <= d0 && pedalIdx < pedalN );
// store the pedal type identifer in the pitch field // store the pedal type identifer in the pitch field
p->array[j].pitch = d0; p->array[j].pitch = d0;