Merge branch 'dev' into dev-0.11

This commit is contained in:
David Reid
2021-08-22 10:02:28 +10:00
+15
View File
@@ -16483,6 +16483,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice)
} }
} }
/* Make sure we don't get stuck in the inner loop. */
if (capturedDeviceFramesProcessed == 0) {
break;
}
totalCapturedDeviceFramesProcessed += capturedDeviceFramesProcessed; totalCapturedDeviceFramesProcessed += capturedDeviceFramesProcessed;
} }
} break; } break;
@@ -16506,6 +16511,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice)
break; break;
} }
/* Make sure we don't get stuck in the inner loop. */
if (framesProcessed == 0) {
break;
}
ma_device__send_frames_to_client(pDevice, framesProcessed, capturedDeviceData); ma_device__send_frames_to_client(pDevice, framesProcessed, capturedDeviceData);
framesReadThisPeriod += framesProcessed; framesReadThisPeriod += framesProcessed;
@@ -16533,6 +16543,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice)
break; break;
} }
/* Make sure we don't get stuck in the inner loop. */
if (framesProcessed == 0) {
break;
}
framesWrittenThisPeriod += framesProcessed; framesWrittenThisPeriod += framesProcessed;
} }
} break; } break;