Skip to content

M
miniaudio
Commit a08320e8 authored by David Reid's avatar David Reid
Browse files
Options

Merge branch 'dev' into dev-0.11

parents db8d96da 04fe7201
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
miniaudio.h
View file @ a08320e8
...@@ -16483,6 +16483,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice) ...@@ -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) ...@@ -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) ...@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment