lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ma_result_descripion all the things

This commit is contained in:
Nevyn Bengtsson 2021-01-13 13:13:54 +01:00 committed by Bjorn
parent a7b0780bfc
commit 49288b7547
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/audio/audio.c
View File

@ -302,7 +302,7 @@ static void _lovrSourceAssignConverter(Source *source) {
ma_data_converter *converter = malloc(sizeof(ma_data_converter));
ma_result converterStatus = ma_data_converter_init(&config, converter);
lovrAssert(converterStatus == MA_SUCCESS, "Problem creating Source data converter #%d: %d", state.converters.length, converterStatus);
lovrAssert(converterStatus == MA_SUCCESS, "Problem creating Source data converter #%d: %s (%d)", state.converters.length, ma_result_description(converterStatus), converterStatus);
arr_expand(&state.converters, 1);
state.converters.data[state.converters.length++] = source->converter = converter;

6
src/modules/data/soundData.c
View File

@ -122,7 +122,7 @@ SoundData* lovrSoundDataCreateStream(uint32_t bufferSizeInFrames, uint32_t chann
soundData->read = lovrSoundDataReadRing;
soundData->ring = calloc(1, sizeof(ma_pcm_rb));
ma_result rbStatus = ma_pcm_rb_init(miniAudioFormatFromLovr[format], channels, bufferSizeInFrames, NULL, NULL, soundData->ring);
lovrAssert(rbStatus == MA_SUCCESS, "Failed to create ring buffer for streamed SoundData");
lovrAssert(rbStatus == MA_SUCCESS, "Failed to create ring buffer for streamed SoundData: %s (%d)", ma_result_description(rbStatus), rbStatus);
return soundData;
}
@ -176,10 +176,10 @@ size_t lovrSoundDataStreamAppendBuffer(SoundData *dest, const void *buf, size_t
while(frameCount > 0) {
uint32_t availableFrames = frameCount;
ma_result acquire_status = ma_pcm_rb_acquire_write(dest->ring, &availableFrames, &store);
lovrAssert(acquire_status == MA_SUCCESS, "Failed to acquire ring buffer");
lovrAssert(acquire_status == MA_SUCCESS, "Failed to acquire ring buffer: %s (%d)", ma_result_description(acquire_status), acquire_status);
memcpy(store, charBuf + blobOffset, availableFrames * bytesPerFrame);
ma_result commit_status = ma_pcm_rb_commit_write(dest->ring, availableFrames, store);
lovrAssert(commit_status == MA_SUCCESS, "Failed to commit to ring buffer");
lovrAssert(commit_status == MA_SUCCESS, "Failed to commit to ring buffer: %s (%d)", ma_result_description(commit_status), commit_status);
if (availableFrames == 0) {
return framesAppended;
}