ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3335 from ShadowsFriend/nopch_fix 

Core: Fix build with portaudio enabled and pch disabled
This commit is contained in:
Pierre Bourdon 2015-12-13 22:26:42 +01:00
parent 513d4f77af 5818d72af4
commit e670d29dfe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/EXI_DeviceMic.cpp
View File

@ -7,6 +7,8 @@
#if HAVE_PORTAUDIO #if HAVE_PORTAUDIO
#include <cstring>
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/HW/EXI.h" #include "Core/HW/EXI.h"
#include "Core/HW/EXI_Device.h" #include "Core/HW/EXI_Device.h"
@ -121,7 +123,7 @@ void CEXIMic::StreamReadOne()
if (samples_avail >= buff_size_samples) if (samples_avail >= buff_size_samples)
{ {
s16 *last_buffer = &stream_buffer[stream_rpos]; s16 *last_buffer = &stream_buffer[stream_rpos];
memcpy(ring_buffer, last_buffer, buff_size); std::memcpy(ring_buffer, last_buffer, buff_size);
samples_avail -= buff_size_samples; samples_avail -= buff_size_samples;
@ -151,7 +153,7 @@ CEXIMic::CEXIMic(int index)
buff_size_samples = buff_size / sample_size; buff_size_samples = buff_size / sample_size;
ring_pos = 0; ring_pos = 0;
memset(ring_buffer, 0, sizeof(ring_buffer)); std::memset(ring_buffer, 0, sizeof(ring_buffer));
next_int_ticks = 0; next_int_ticks = 0;