mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-23 16:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors with the C++ build.

Browse Source
This commit is contained in:
David Reid
2021-01-19 19:22:52 +10:00
parent d8c2135e0b
commit 776d7ddd91
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
research/miniaudio_engine.h
+7 -5
View File
@@ -3142,7 +3142,7 @@ MA_API ma_result ma_node_set_state(ma_node* pNode, ma_node_state state)
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
c89atomic_exchange_i16(&pNodeBase->state, state); c89atomic_exchange_i32(&pNodeBase->state, state);
return MA_SUCCESS; return MA_SUCCESS;
} }
@@ -3155,7 +3155,7 @@ MA_API ma_node_state ma_node_get_state(const ma_node* pNode)
return ma_node_state_stopped; return ma_node_state_stopped;
} }
return c89atomic_load_i16(&pNodeBase->state); return (ma_node_state)c89atomic_load_i32(&pNodeBase->state);
} }
MA_API ma_result ma_node_set_state_time(ma_node* pNode, ma_node_state state, ma_uint64 globalTime) MA_API ma_result ma_node_set_state_time(ma_node* pNode, ma_node_state state, ma_uint64 globalTime)
@@ -8445,11 +8445,13 @@ MA_API ma_result ma_spatializer_process_pcm_frames(ma_spatializer* pSpatializer,
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
/* Floating point is the only supported format. */
/* Spatialization is not yet implemented. However, do do need to do channel conversion here. */ /* Spatialization is not yet implemented. However, do do need to do channel conversion here. */
if (pSpatializer->channelsIn == pSpatializer->channelsOut) { if (pSpatializer->channelsIn == pSpatializer->channelsOut) {
ma_copy_pcm_frames(pFramesOut, pFramesIn, frameCount, ma_format_f32, pSpatializer->channelsIn); ma_copy_pcm_frames(pFramesOut, pFramesIn, frameCount, ma_format_f32, pSpatializer->channelsIn);
} else { } else {
ma_convert_pcm_frames_channels_f32(pFramesOut, pSpatializer->channelsOut, pFramesIn, pSpatializer->channelsIn, frameCount); ma_convert_pcm_frames_channels_f32((float*)pFramesOut, pSpatializer->channelsOut, (const float*)pFramesIn, pSpatializer->channelsIn, frameCount); /* Safe casts to float* because f32 is the only supported format. */
} }
return MA_SUCCESS; return MA_SUCCESS;
@@ -8939,7 +8941,7 @@ static void ma_engine_node_process_pcm_frames__group(ma_node* pNode, const float
static ma_uint32 ma_engine_node_get_required_input_frame_count__group(ma_node* pNode, ma_uint32 outputFrameCount) static ma_uint32 ma_engine_node_get_required_input_frame_count__group(ma_node* pNode, ma_uint32 outputFrameCount)
{ {
ma_uint64 result = ma_engine_node_get_required_input_frame_count(pNode, outputFrameCount); ma_uint64 result = ma_engine_node_get_required_input_frame_count((ma_engine_node*)pNode, outputFrameCount);
if (result > 0xFFFFFFFF) { if (result > 0xFFFFFFFF) {
result = 0xFFFFFFFF; /* Will never happen because miniaudio will only ever process in relatively small chunks. */ result = 0xFFFFFFFF; /* Will never happen because miniaudio will only ever process in relatively small chunks. */
} }
@@ -9458,7 +9460,7 @@ MA_API ma_result ma_engine_play_sound_ex(ma_engine* pEngine, const char* pFilePa
ma_sound_uninit(&pNextSound->sound); ma_sound_uninit(&pNextSound->sound);
} else { } else {
/* No sound available for recycling. Allocate one now. */ /* No sound available for recycling. Allocate one now. */
pSound = ma_malloc(sizeof(*pSound), &pEngine->allocationCallbacks); pSound = (ma_sound_inlined*)ma_malloc(sizeof(*pSound), &pEngine->allocationCallbacks);
} }
if (pSound != NULL) { /* Safety check for the allocation above. */ if (pSound != NULL) { /* Safety check for the allocation above. */