--- libgig/trunk/src/gig.cpp 2006/02/06 17:58:21 834
+++ libgig/trunk/src/gig.cpp 2006/07/22 14:22:01 902
@@ -51,26 +51,6 @@
namespace gig {
-// *************** dimension_def_t ***************
-// *
-
- dimension_def_t& dimension_def_t::operator=(const dimension_def_t& arg) {
- dimension = arg.dimension;
- bits = arg.bits;
- zones = arg.zones;
- split_type = arg.split_type;
- ranges = arg.ranges;
- zone_size = arg.zone_size;
- if (ranges) {
- ranges = new range_t[zones];
- for (int i = 0; i < zones; i++)
- ranges[i] = arg.ranges[i];
- }
- return *this;
- }
-
-
-
// *************** progress_t ***************
// *
@@ -131,6 +111,13 @@
return x & 0x800000 ? x - 0x1000000 : x;
}
+ inline void store24(unsigned char* pDst, int x)
+ {
+ pDst[0] = x;
+ pDst[1] = x >> 8;
+ pDst[2] = x >> 16;
+ }
+
void Decompress16(int compressionmode, const unsigned char* params,
int srcStep, int dstStep,
const unsigned char* pSrc, int16_t* pDst,
@@ -170,14 +157,11 @@
}
void Decompress24(int compressionmode, const unsigned char* params,
- int dstStep, const unsigned char* pSrc, int16_t* pDst,
+ int dstStep, const unsigned char* pSrc, uint8_t* pDst,
unsigned long currentframeoffset,
unsigned long copysamples, int truncatedBits)
{
- // Note: The 24 bits are truncated to 16 bits for now.
-
int y, dy, ddy, dddy;
- const int shift = 8 - truncatedBits;
#define GET_PARAMS(params) \
y = get24(params); \
@@ -193,14 +177,14 @@
#define COPY_ONE(x) \
SKIP_ONE(x); \
- *pDst = y >> shift; \
+ store24(pDst, y << truncatedBits); \
pDst += dstStep
switch (compressionmode) {
case 2: // 24 bit uncompressed
pSrc += currentframeoffset * 3;
while (copysamples) {
- *pDst = get24(pSrc) >> shift;
+ store24(pDst, get24(pSrc) << truncatedBits);
pDst += dstStep;
pSrc += 3;
copysamples--;
@@ -368,7 +352,7 @@
}
FrameOffset = 0; // just for streaming compressed samples
- LoopSize = LoopEnd - LoopStart;
+ LoopSize = LoopEnd - LoopStart + 1;
}
/**
@@ -742,139 +726,146 @@
* @param SampleCount number of sample points to read
* @param pPlaybackState will be used to store and reload the playback
* state for the next ReadAndLoop() call
+ * @param pDimRgn dimension region with looping information
* @param pExternalDecompressionBuffer (optional) external buffer to use for decompression
* @returns number of successfully read sample points
* @see CreateDecompressionBuffer()
*/
- unsigned long Sample::ReadAndLoop(void* pBuffer, unsigned long SampleCount, playback_state_t* pPlaybackState, buffer_t* pExternalDecompressionBuffer) {
+ unsigned long Sample::ReadAndLoop(void* pBuffer, unsigned long SampleCount, playback_state_t* pPlaybackState,
+ DimensionRegion* pDimRgn, buffer_t* pExternalDecompressionBuffer) {
unsigned long samplestoread = SampleCount, totalreadsamples = 0, readsamples, samplestoloopend;
uint8_t* pDst = (uint8_t*) pBuffer;
SetPos(pPlaybackState->position); // recover position from the last time
- if (this->Loops && GetPos() <= this->LoopEnd) { // honor looping if there are loop points defined
+ if (pDimRgn->SampleLoops) { // honor looping if there are loop points defined
- switch (this->LoopType) {
+ const DLS::sample_loop_t& loop = pDimRgn->pSampleLoops[0];
+ const uint32_t loopEnd = loop.LoopStart + loop.LoopLength;
- case loop_type_bidirectional: { //TODO: not tested yet!
- do {
- // if not endless loop check if max. number of loop cycles have been passed
- if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
-
- if (!pPlaybackState->reverse) { // forward playback
- do {
- samplestoloopend = this->LoopEnd - GetPos();
- readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
- samplestoread -= readsamples;
- totalreadsamples += readsamples;
- if (readsamples == samplestoloopend) {
- pPlaybackState->reverse = true;
- break;
- }
- } while (samplestoread && readsamples);
- }
- else { // backward playback
+ if (GetPos() <= loopEnd) {
+ switch (loop.LoopType) {
- // as we can only read forward from disk, we have to
- // determine the end position within the loop first,
- // read forward from that 'end' and finally after
- // reading, swap all sample frames so it reflects
- // backward playback
-
- unsigned long swapareastart = totalreadsamples;
- unsigned long loopoffset = GetPos() - this->LoopStart;
- unsigned long samplestoreadinloop = Min(samplestoread, loopoffset);
- unsigned long reverseplaybackend = GetPos() - samplestoreadinloop;
-
- SetPos(reverseplaybackend);
-
- // read samples for backward playback
- do {
- readsamples = Read(&pDst[totalreadsamples * this->FrameSize], samplestoreadinloop, pExternalDecompressionBuffer);
- samplestoreadinloop -= readsamples;
- samplestoread -= readsamples;
- totalreadsamples += readsamples;
- } while (samplestoreadinloop && readsamples);
+ case loop_type_bidirectional: { //TODO: not tested yet!
+ do {
+ // if not endless loop check if max. number of loop cycles have been passed
+ if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
+
+ if (!pPlaybackState->reverse) { // forward playback
+ do {
+ samplestoloopend = loopEnd - GetPos();
+ readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
+ samplestoread -= readsamples;
+ totalreadsamples += readsamples;
+ if (readsamples == samplestoloopend) {
+ pPlaybackState->reverse = true;
+ break;
+ }
+ } while (samplestoread && readsamples);
+ }
+ else { // backward playback
- SetPos(reverseplaybackend); // pretend we really read backwards
+ // as we can only read forward from disk, we have to
+ // determine the end position within the loop first,
+ // read forward from that 'end' and finally after
+ // reading, swap all sample frames so it reflects
+ // backward playback
+
+ unsigned long swapareastart = totalreadsamples;
+ unsigned long loopoffset = GetPos() - loop.LoopStart;
+ unsigned long samplestoreadinloop = Min(samplestoread, loopoffset);
+ unsigned long reverseplaybackend = GetPos() - samplestoreadinloop;
+
+ SetPos(reverseplaybackend);
+
+ // read samples for backward playback
+ do {
+ readsamples = Read(&pDst[totalreadsamples * this->FrameSize], samplestoreadinloop, pExternalDecompressionBuffer);
+ samplestoreadinloop -= readsamples;
+ samplestoread -= readsamples;
+ totalreadsamples += readsamples;
+ } while (samplestoreadinloop && readsamples);
+
+ SetPos(reverseplaybackend); // pretend we really read backwards
+
+ if (reverseplaybackend == loop.LoopStart) {
+ pPlaybackState->loop_cycles_left--;
+ pPlaybackState->reverse = false;
+ }
- if (reverseplaybackend == this->LoopStart) {
- pPlaybackState->loop_cycles_left--;
- pPlaybackState->reverse = false;
+ // reverse the sample frames for backward playback
+ SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
}
+ } while (samplestoread && readsamples);
+ break;
+ }
- // reverse the sample frames for backward playback
- SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
- }
- } while (samplestoread && readsamples);
- break;
- }
-
- case loop_type_backward: { // TODO: not tested yet!
- // forward playback (not entered the loop yet)
- if (!pPlaybackState->reverse) do {
- samplestoloopend = this->LoopEnd - GetPos();
- readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
- samplestoread -= readsamples;
- totalreadsamples += readsamples;
- if (readsamples == samplestoloopend) {
- pPlaybackState->reverse = true;
- break;
- }
- } while (samplestoread && readsamples);
+ case loop_type_backward: { // TODO: not tested yet!
+ // forward playback (not entered the loop yet)
+ if (!pPlaybackState->reverse) do {
+ samplestoloopend = loopEnd - GetPos();
+ readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
+ samplestoread -= readsamples;
+ totalreadsamples += readsamples;
+ if (readsamples == samplestoloopend) {
+ pPlaybackState->reverse = true;
+ break;
+ }
+ } while (samplestoread && readsamples);
- if (!samplestoread) break;
+ if (!samplestoread) break;
- // as we can only read forward from disk, we have to
- // determine the end position within the loop first,
- // read forward from that 'end' and finally after
- // reading, swap all sample frames so it reflects
- // backward playback
-
- unsigned long swapareastart = totalreadsamples;
- unsigned long loopoffset = GetPos() - this->LoopStart;
- unsigned long samplestoreadinloop = (this->LoopPlayCount) ? Min(samplestoread, pPlaybackState->loop_cycles_left * LoopSize - loopoffset)
- : samplestoread;
- unsigned long reverseplaybackend = this->LoopStart + Abs((loopoffset - samplestoreadinloop) % this->LoopSize);
-
- SetPos(reverseplaybackend);
-
- // read samples for backward playback
- do {
- // if not endless loop check if max. number of loop cycles have been passed
- if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
- samplestoloopend = this->LoopEnd - GetPos();
- readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoreadinloop, samplestoloopend), pExternalDecompressionBuffer);
- samplestoreadinloop -= readsamples;
- samplestoread -= readsamples;
- totalreadsamples += readsamples;
- if (readsamples == samplestoloopend) {
- pPlaybackState->loop_cycles_left--;
- SetPos(this->LoopStart);
- }
- } while (samplestoreadinloop && readsamples);
+ // as we can only read forward from disk, we have to
+ // determine the end position within the loop first,
+ // read forward from that 'end' and finally after
+ // reading, swap all sample frames so it reflects
+ // backward playback
+
+ unsigned long swapareastart = totalreadsamples;
+ unsigned long loopoffset = GetPos() - loop.LoopStart;
+ unsigned long samplestoreadinloop = (this->LoopPlayCount) ? Min(samplestoread, pPlaybackState->loop_cycles_left * loop.LoopLength - loopoffset)
+ : samplestoread;
+ unsigned long reverseplaybackend = loop.LoopStart + Abs((loopoffset - samplestoreadinloop) % loop.LoopLength);
+
+ SetPos(reverseplaybackend);
+
+ // read samples for backward playback
+ do {
+ // if not endless loop check if max. number of loop cycles have been passed
+ if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
+ samplestoloopend = loopEnd - GetPos();
+ readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoreadinloop, samplestoloopend), pExternalDecompressionBuffer);
+ samplestoreadinloop -= readsamples;
+ samplestoread -= readsamples;
+ totalreadsamples += readsamples;
+ if (readsamples == samplestoloopend) {
+ pPlaybackState->loop_cycles_left--;
+ SetPos(loop.LoopStart);
+ }
+ } while (samplestoreadinloop && readsamples);
- SetPos(reverseplaybackend); // pretend we really read backwards
+ SetPos(reverseplaybackend); // pretend we really read backwards
- // reverse the sample frames for backward playback
- SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
- break;
- }
+ // reverse the sample frames for backward playback
+ SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
+ break;
+ }
- default: case loop_type_normal: {
- do {
- // if not endless loop check if max. number of loop cycles have been passed
- if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
- samplestoloopend = this->LoopEnd - GetPos();
- readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
- samplestoread -= readsamples;
- totalreadsamples += readsamples;
- if (readsamples == samplestoloopend) {
- pPlaybackState->loop_cycles_left--;
- SetPos(this->LoopStart);
- }
- } while (samplestoread && readsamples);
- break;
+ default: case loop_type_normal: {
+ do {
+ // if not endless loop check if max. number of loop cycles have been passed
+ if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
+ samplestoloopend = loopEnd - GetPos();
+ readsamples = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
+ samplestoread -= readsamples;
+ totalreadsamples += readsamples;
+ if (readsamples == samplestoloopend) {
+ pPlaybackState->loop_cycles_left--;
+ SetPos(loop.LoopStart);
+ }
+ } while (samplestoread && readsamples);
+ break;
+ }
}
}
}
@@ -904,6 +895,10 @@
* have to use an external decompression buffer for EACH
* streaming thread to avoid race conditions and crashes!
*
+ * For 16 bit samples, the data in the buffer will be int16_t
+ * (using native endianness). For 24 bit, the buffer will
+ * contain three bytes per sample, little-endian.
+ *
* @param pBuffer destination buffer
* @param SampleCount number of sample points to read
* @param pExternalDecompressionBuffer (optional) external buffer to use for decompression
@@ -914,27 +909,7 @@
if (SampleCount == 0) return 0;
if (!Compressed) {
if (BitDepth == 24) {
- // 24 bit sample. For now just truncate to 16 bit.
- unsigned char* pSrc = (unsigned char*) ((pExternalDecompressionBuffer) ? pExternalDecompressionBuffer->pStart : this->InternalDecompressionBuffer.pStart);
- int16_t* pDst = static_cast(pBuffer);
- if (Channels == 2) { // Stereo
- unsigned long readBytes = pCkData->Read(pSrc, SampleCount * 6, 1);
- pSrc++;
- for (unsigned long i = readBytes ; i > 0 ; i -= 3) {
- *pDst++ = get16(pSrc);
- pSrc += 3;
- }
- return (pDst - static_cast(pBuffer)) >> 1;
- }
- else { // Mono
- unsigned long readBytes = pCkData->Read(pSrc, SampleCount * 3, 1);
- pSrc++;
- for (unsigned long i = readBytes ; i > 0 ; i -= 3) {
- *pDst++ = get16(pSrc);
- pSrc += 3;
- }
- return pDst - static_cast(pBuffer);
- }
+ return pCkData->Read(pBuffer, SampleCount * FrameSize, 1) / FrameSize;
}
else { // 16 bit
// (pCkData->Read does endian correction)
@@ -964,6 +939,7 @@
unsigned char* pSrc = (unsigned char*) pDecompressionBuffer->pStart;
int16_t* pDst = static_cast(pBuffer);
+ uint8_t* pDst24 = static_cast(pBuffer);
remainingbytes = pCkData->Read(pSrc, assumedsize, 1);
while (remainingsamples && remainingbytes) {
@@ -1045,16 +1021,16 @@
const unsigned char* const param_r = pSrc;
if (mode_r != 2) pSrc += 12;
- Decompress24(mode_l, param_l, 2, pSrc, pDst,
+ Decompress24(mode_l, param_l, 6, pSrc, pDst24,
skipsamples, copysamples, TruncatedBits);
- Decompress24(mode_r, param_r, 2, pSrc + rightChannelOffset, pDst + 1,
+ Decompress24(mode_r, param_r, 6, pSrc + rightChannelOffset, pDst24 + 3,
skipsamples, copysamples, TruncatedBits);
- pDst += copysamples << 1;
+ pDst24 += copysamples * 6;
}
else { // Mono
- Decompress24(mode_l, param_l, 1, pSrc, pDst,
+ Decompress24(mode_l, param_l, 3, pSrc, pDst24,
skipsamples, copysamples, TruncatedBits);
- pDst += copysamples;
+ pDst24 += copysamples * 3;
}
}
else { // 16 bit
@@ -1449,6 +1425,7 @@
VCFCutoffController <= vcf_cutoff_ctrl_none2 ? VCFVelocityScale : 0);
SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));
+ VelocityTable = 0;
}
/**
@@ -1968,6 +1945,7 @@
delete pVelocityTables;
pVelocityTables = NULL;
}
+ if (VelocityTable) delete[] VelocityTable;
}
/**
@@ -2092,7 +2070,6 @@
pDimensionDefinitions[i].bits = 0;
pDimensionDefinitions[i].zones = 0;
pDimensionDefinitions[i].split_type = split_type_bit;
- pDimensionDefinitions[i].ranges = NULL;
pDimensionDefinitions[i].zone_size = 0;
}
else { // active dimension
@@ -2102,10 +2079,10 @@
pDimensionDefinitions[i].split_type = (dimension == dimension_layer ||
dimension == dimension_samplechannel ||
dimension == dimension_releasetrigger ||
+ dimension == dimension_keyboard ||
dimension == dimension_roundrobin ||
dimension == dimension_random) ? split_type_bit
: split_type_normal;
- pDimensionDefinitions[i].ranges = NULL; // it's not possible to check velocity dimensions for custom defined ranges at this point
pDimensionDefinitions[i].zone_size =
(pDimensionDefinitions[i].split_type == split_type_normal) ? 128.0 / pDimensionDefinitions[i].zones
: 0;
@@ -2118,25 +2095,11 @@
}
for (int i = dimensionBits ; i < 8 ; i++) pDimensionDefinitions[i].bits = 0;
- // check velocity dimension (if there is one) for custom defined zone ranges
- for (uint i = 0; i < Dimensions; i++) {
- dimension_def_t* pDimDef = pDimensionDefinitions + i;
- if (pDimDef->dimension == dimension_velocity) {
- if (pDimensionRegions[0]->VelocityUpperLimit == 0) {
- // no custom defined ranges
- pDimDef->split_type = split_type_normal;
- pDimDef->ranges = NULL;
- }
- else { // custom defined ranges
- pDimDef->split_type = split_type_customvelocity;
- pDimDef->ranges = new range_t[pDimDef->zones];
- UpdateVelocityTable(pDimDef);
- }
- }
- }
+ // if there's a velocity dimension and custom velocity zone splits are used,
+ // update the VelocityTables in the dimension regions
+ UpdateVelocityTable();
// jump to start of the wave pool indices (if not already there)
- File* file = (File*) GetParent()->GetParent();
if (file->pVersion && file->pVersion->major == 3)
_3lnk->SetPos(68); // version 3 has a different 3lnk structure
else
@@ -2145,7 +2108,7 @@
// load sample references
for (uint i = 0; i < DimensionRegions; i++) {
uint32_t wavepoolindex = _3lnk->ReadUint32();
- pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
+ if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
}
}
@@ -2234,30 +2197,64 @@
}
}
- void Region::UpdateVelocityTable(dimension_def_t* pDimDef) {
- // get dimension's index
- int iDimensionNr = -1;
- for (int i = 0; i < Dimensions; i++) {
- if (&pDimensionDefinitions[i] == pDimDef) {
- iDimensionNr = i;
+ void Region::UpdateVelocityTable() {
+ // get velocity dimension's index
+ int veldim = -1;
+ for (int i = 0 ; i < Dimensions ; i++) {
+ if (pDimensionDefinitions[i].dimension == gig::dimension_velocity) {
+ veldim = i;
break;
}
}
- if (iDimensionNr < 0) throw gig::Exception("Invalid dimension_def_t pointer");
+ if (veldim == -1) return;
+
+ int step = 1;
+ for (int i = 0 ; i < veldim ; i++) step <<= pDimensionDefinitions[i].bits;
+ int skipveldim = (step << pDimensionDefinitions[veldim].bits) - step;
+ int end = step * pDimensionDefinitions[veldim].zones;
+
+ // loop through all dimension regions for all dimensions except the velocity dimension
+ int dim[8] = { 0 };
+ for (int i = 0 ; i < DimensionRegions ; i++) {
+
+ if (pDimensionRegions[i]->VelocityUpperLimit) {
+ // create the velocity table
+ uint8_t* table = pDimensionRegions[i]->VelocityTable;
+ if (!table) {
+ table = new uint8_t[128];
+ pDimensionRegions[i]->VelocityTable = table;
+ }
+ int tableidx = 0;
+ int velocityZone = 0;
+ for (int k = i ; k < end ; k += step) {
+ DimensionRegion *d = pDimensionRegions[k];
+ for (; tableidx <= d->VelocityUpperLimit ; tableidx++) table[tableidx] = velocityZone;
+ velocityZone++;
+ }
+ } else {
+ if (pDimensionRegions[i]->VelocityTable) {
+ delete[] pDimensionRegions[i]->VelocityTable;
+ pDimensionRegions[i]->VelocityTable = 0;
+ }
+ }
- uint8_t bits[8] = { 0 };
- int previousUpperLimit = -1;
- for (int velocityZone = 0; velocityZone < pDimDef->zones; velocityZone++) {
- bits[iDimensionNr] = velocityZone;
- DimensionRegion* pDimRegion = GetDimensionRegionByBit(bits);
-
- pDimDef->ranges[velocityZone].low = previousUpperLimit + 1;
- pDimDef->ranges[velocityZone].high = pDimRegion->VelocityUpperLimit;
- previousUpperLimit = pDimDef->ranges[velocityZone].high;
- // fill velocity table
- for (int i = pDimDef->ranges[velocityZone].low; i <= pDimDef->ranges[velocityZone].high; i++) {
- VelocityTable[i] = velocityZone;
+ int j;
+ int shift = 0;
+ for (j = 0 ; j < Dimensions ; j++) {
+ if (j == veldim) i += skipveldim; // skip velocity dimension
+ else {
+ dim[j]++;
+ if (dim[j] < pDimensionDefinitions[j].zones) break;
+ else {
+ // skip unused dimension regions
+ dim[j] = 0;
+ i += ((1 << pDimensionDefinitions[j].bits) -
+ pDimensionDefinitions[j].zones) << shift;
+ }
+ }
+ shift += pDimensionDefinitions[j].bits;
}
+ if (j == Dimensions) break;
}
}
@@ -2312,11 +2309,7 @@
// if this is a layer dimension, update 'Layers' attribute
if (pDimDef->dimension == dimension_layer) Layers = pDimDef->zones;
- // if this is velocity dimension and got custom defined ranges, update velocity table
- if (pDimDef->dimension == dimension_velocity &&
- pDimDef->split_type == split_type_customvelocity) {
- UpdateVelocityTable(pDimDef);
- }
+ UpdateVelocityTable();
}
/** @brief Delete an existing dimension.
@@ -2386,10 +2379,6 @@
pDimensionDefinitions[Dimensions - 1].dimension = dimension_none;
pDimensionDefinitions[Dimensions - 1].bits = 0;
pDimensionDefinitions[Dimensions - 1].zones = 0;
- if (pDimensionDefinitions[Dimensions - 1].ranges) {
- delete[] pDimensionDefinitions[Dimensions - 1].ranges;
- pDimensionDefinitions[Dimensions - 1].ranges = NULL;
- }
Dimensions--;
@@ -2398,9 +2387,6 @@
}
Region::~Region() {
- for (uint i = 0; i < Dimensions; i++) {
- if (pDimensionDefinitions[i].ranges) delete[] pDimensionDefinitions[i].ranges;
- }
for (int i = 0; i < 256; i++) {
if (pDimensionRegions[i]) delete pDimensionRegions[i];
}
@@ -2425,23 +2411,42 @@
* @see Dimensions
*/
DimensionRegion* Region::GetDimensionRegionByValue(const uint DimValues[8]) {
- uint8_t bits[8] = { 0 };
+ uint8_t bits;
+ int veldim = -1;
+ int velbitpos;
+ int bitpos = 0;
+ int dimregidx = 0;
for (uint i = 0; i < Dimensions; i++) {
- bits[i] = DimValues[i];
- switch (pDimensionDefinitions[i].split_type) {
- case split_type_normal:
- bits[i] = uint8_t(bits[i] / pDimensionDefinitions[i].zone_size);
- break;
- case split_type_customvelocity:
- bits[i] = VelocityTable[bits[i]];
- break;
- case split_type_bit: // the value is already the sought dimension bit number
- const uint8_t limiter_mask = (0xff << pDimensionDefinitions[i].bits) ^ 0xff;
- bits[i] = bits[i] & limiter_mask; // just make sure the value don't uses more bits than allowed
- break;
+ if (pDimensionDefinitions[i].dimension == dimension_velocity) {
+ // the velocity dimension must be handled after the other dimensions
+ veldim = i;
+ velbitpos = bitpos;
+ } else {
+ switch (pDimensionDefinitions[i].split_type) {
+ case split_type_normal:
+ bits = uint8_t(DimValues[i] / pDimensionDefinitions[i].zone_size);
+ break;
+ case split_type_bit: // the value is already the sought dimension bit number
+ const uint8_t limiter_mask = (0xff << pDimensionDefinitions[i].bits) ^ 0xff;
+ bits = DimValues[i] & limiter_mask; // just make sure the value doesn't use more bits than allowed
+ break;
+ }
+ dimregidx |= bits << bitpos;
}
+ bitpos += pDimensionDefinitions[i].bits;
+ }
+ DimensionRegion* dimreg = pDimensionRegions[dimregidx];
+ if (veldim != -1) {
+ // (dimreg is now the dimension region for the lowest velocity)
+ if (dimreg->VelocityUpperLimit) // custom defined zone ranges
+ bits = dimreg->VelocityTable[DimValues[veldim]];
+ else // normal split type
+ bits = uint8_t(DimValues[veldim] / pDimensionDefinitions[veldim].zone_size);
+
+ dimregidx |= bits << velbitpos;
+ dimreg = pDimensionRegions[dimregidx];
}
- return GetDimensionRegionByBit(bits);
+ return dimreg;
}
/**
@@ -2481,6 +2486,7 @@
Sample* Region::GetSampleFromWavePool(unsigned int WavePoolTableIndex, progress_t* pProgress) {
if ((int32_t)WavePoolTableIndex == -1) return NULL;
File* file = (File*) GetParent()->GetParent();
+ if (!file->pWavePoolTable) return NULL;
unsigned long soughtoffset = file->pWavePoolTable[WavePoolTableIndex];
unsigned long soughtfileno = file->pWavePoolTableHi[WavePoolTableIndex];
Sample* sample = file->GetFirstSample(pProgress);