Signed-off-by: falkTX <falktx@falktx.com>tags/v2.1-rc1
| @@ -1561,7 +1561,7 @@ public: | |||||
| for (uint32_t k=0; k < frames; ++k) | for (uint32_t k=0; k < frames; ++k) | ||||
| { | { | ||||
| # ifndef BUILD_BRIDGE | # ifndef BUILD_BRIDGE | ||||
| if (k < pData->latency.frames) | |||||
| if (k < pData->latency.frames && pData->latency.buffers != nullptr) | |||||
| bufValue = pData->latency.buffers[c][k]; | bufValue = pData->latency.buffers[c][k]; | ||||
| else if (pData->latency.frames < frames) | else if (pData->latency.frames < frames) | ||||
| bufValue = audioIn[c][k-pData->latency.frames]; | bufValue = audioIn[c][k-pData->latency.frames]; | ||||
| @@ -1618,8 +1618,10 @@ public: | |||||
| // -------------------------------------------------------------------------------------------------------- | // -------------------------------------------------------------------------------------------------------- | ||||
| // Save latency values for next callback | // Save latency values for next callback | ||||
| if (const uint32_t latframes = pData->latency.frames) | |||||
| if (pData->latency.frames != 0 && pData->latency.buffers != nullptr) | |||||
| { | { | ||||
| const uint32_t latframes = pData->latency.frames; | |||||
| if (latframes <= frames) | if (latframes <= frames) | ||||
| { | { | ||||
| for (uint32_t i=0; i < pData->audioIn.count; ++i) | for (uint32_t i=0; i < pData->audioIn.count; ++i) | ||||
| @@ -1627,7 +1629,7 @@ public: | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| const uint32_t diff = pData->latency.frames-frames; | |||||
| const uint32_t diff = latframes - frames; | |||||
| for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | ||||
| { | { | ||||
| @@ -1869,7 +1869,7 @@ public: | |||||
| for (uint32_t k=0; k < frames; ++k) | for (uint32_t k=0; k < frames; ++k) | ||||
| { | { | ||||
| if (k < pData->latency.frames) | |||||
| if (k < pData->latency.frames && pData->latency.buffers != nullptr) | |||||
| bufValue = pData->latency.buffers[c][k]; | bufValue = pData->latency.buffers[c][k]; | ||||
| else if (pData->latency.frames < frames) | else if (pData->latency.frames < frames) | ||||
| bufValue = fAudioInBuffers[c][k-pData->latency.frames]; | bufValue = fAudioInBuffers[c][k-pData->latency.frames]; | ||||
| @@ -1923,9 +1923,10 @@ public: | |||||
| // -------------------------------------------------------------------------------------------------------- | // -------------------------------------------------------------------------------------------------------- | ||||
| // Save latency values for next callback | // Save latency values for next callback | ||||
| if (const uint32_t latframes = pData->latency.frames) | |||||
| if (pData->latency.frames != 0 && pData->latency.buffers != nullptr) | |||||
| { | { | ||||
| CARLA_SAFE_ASSERT(timeOffset == 0); | CARLA_SAFE_ASSERT(timeOffset == 0); | ||||
| const uint32_t latframes = pData->latency.frames; | |||||
| if (latframes <= frames) | if (latframes <= frames) | ||||
| { | { | ||||
| @@ -1934,7 +1935,7 @@ public: | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| const uint32_t diff = pData->latency.frames-frames; | |||||
| const uint32_t diff = latframes - frames; | |||||
| for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | ||||
| { | { | ||||
| @@ -1216,7 +1216,7 @@ public: | |||||
| for (uint32_t k=0; k < frames; ++k) | for (uint32_t k=0; k < frames; ++k) | ||||
| { | { | ||||
| # ifndef BUILD_BRIDGE | # ifndef BUILD_BRIDGE | ||||
| if (k < pData->latency.frames) | |||||
| if (k < pData->latency.frames && pData->latency.buffers != nullptr) | |||||
| bufValue = pData->latency.buffers[c][k]; | bufValue = pData->latency.buffers[c][k]; | ||||
| else if (pData->latency.frames < frames) | else if (pData->latency.frames < frames) | ||||
| bufValue = fAudioInBuffers[c][k-pData->latency.frames]; | bufValue = fAudioInBuffers[c][k-pData->latency.frames]; | ||||
| @@ -1272,9 +1272,10 @@ public: | |||||
| // -------------------------------------------------------------------------------------------------------- | // -------------------------------------------------------------------------------------------------------- | ||||
| // Save latency values for next callback | // Save latency values for next callback | ||||
| if (const uint32_t latframes = pData->latency.frames) | |||||
| if (pData->latency.frames != 0 && pData->latency.buffers != nullptr) | |||||
| { | { | ||||
| CARLA_SAFE_ASSERT(timeOffset == 0); | CARLA_SAFE_ASSERT(timeOffset == 0); | ||||
| const uint32_t latframes = pData->latency.frames; | |||||
| if (latframes <= frames) | if (latframes <= frames) | ||||
| { | { | ||||
| @@ -1283,7 +1284,7 @@ public: | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| const uint32_t diff = pData->latency.frames-frames; | |||||
| const uint32_t diff = latframes - frames; | |||||
| for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | ||||
| { | { | ||||
| @@ -4066,7 +4066,7 @@ public: | |||||
| for (uint32_t k=0; k < frames; ++k) | for (uint32_t k=0; k < frames; ++k) | ||||
| { | { | ||||
| # ifndef BUILD_BRIDGE | # ifndef BUILD_BRIDGE | ||||
| if (k < pData->latency.frames) | |||||
| if (k < pData->latency.frames && pData->latency.buffers != nullptr) | |||||
| bufValue = pData->latency.buffers[c][k]; | bufValue = pData->latency.buffers[c][k]; | ||||
| else if (pData->latency.frames < frames) | else if (pData->latency.frames < frames) | ||||
| bufValue = fAudioInBuffers[c][k-pData->latency.frames]; | bufValue = fAudioInBuffers[c][k-pData->latency.frames]; | ||||
| @@ -4121,9 +4121,10 @@ public: | |||||
| // -------------------------------------------------------------------------------------------------------- | // -------------------------------------------------------------------------------------------------------- | ||||
| // Save latency values for next callback | // Save latency values for next callback | ||||
| if (const uint32_t latframes = pData->latency.frames) | |||||
| if (pData->latency.frames != 0 && pData->latency.buffers != nullptr) | |||||
| { | { | ||||
| CARLA_SAFE_ASSERT(timeOffset == 0); | CARLA_SAFE_ASSERT(timeOffset == 0); | ||||
| const uint32_t latframes = pData->latency.frames; | |||||
| if (latframes <= frames) | if (latframes <= frames) | ||||
| { | { | ||||
| @@ -4132,7 +4133,7 @@ public: | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| const uint32_t diff = pData->latency.frames-frames; | |||||
| const uint32_t diff = latframes - frames; | |||||
| for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | for (uint32_t i=0, k; i<pData->audioIn.count; ++i) | ||||
| { | { | ||||