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

Fix build on MSVC2019 (ptr arithmetic on void * is nonstandard)

This commit is contained in:
mcc 2020-12-19 16:40:39 -05:00 committed by Bjorn
parent 061f613697
commit fb2d4fe0ca
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,8 @@ static void onPlayback(ma_device* device, void* output, const void* _, uint32_t
ma_mutex_unlock(&state.playbackLock);
}
static void onCapture(ma_device* device, void* output, const void* input, uint32_t frames) {
static void onCapture(ma_device* device, void* output, const void* inputUntyped, uint32_t frames) {
const float *input = inputUntyped;
// note: uses ma_pcm_rb which is lockless
size_t bytesPerFrame = SampleFormatBytesPerFrame(CAPTURE_CHANNELS, state.config[AUDIO_CAPTURE].format);
lovrSoundDataStreamAppendBuffer(state.captureStream, input, frames*bytesPerFrame);

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

@ -65,8 +65,13 @@ static uint32_t lovrSoundDataReadMp3(SoundData* soundData, uint32_t offset, uint
}
*/
<<<<<<< HEAD
static uint32_t lovrSoundDataReadRing(SoundData* soundData, uint32_t offset, uint32_t count, void* data) {
uint8_t *charData = (uint8_t*)data;
=======
static uint32_t lovrSoundDataReadRing(SoundData* soundData, uint32_t offset, uint32_t count, void* _data) {
char *data = _data;
>>>>>>> 8953ec23... Fix build on MSVC2019 (ptr arithmetic on void * is nonstandard)
size_t bytesPerFrame = SampleFormatBytesPerFrame(soundData->channels, soundData->format);
size_t totalRead = 0;
while(count > 0) {