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

reset samples_avail when stopping gc mic sampling. fixes Mario Party 7

This commit is contained in:
sktsqrl 2012-07-11 01:03:25 -07:00
parent c57640dfbd
commit 1d44de53b5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
View File

@ -38,12 +38,12 @@ void CEXIMic::StreamLog(const char *msg)
void CEXIMic::StreamInit() void CEXIMic::StreamInit()
{ {
// Setup the wonderful c-interfaced lib... // Setup the wonderful c-interfaced lib...
pa_stream = NULL; pa_stream = nullptr;
if ((pa_error = Pa_Initialize()) != paNoError) if ((pa_error = Pa_Initialize()) != paNoError)
StreamLog("Pa_Initialize"); StreamLog("Pa_Initialize");
stream_buffer = NULL; stream_buffer = nullptr;
samples_avail = stream_wpos = stream_rpos = 0; samples_avail = stream_wpos = stream_rpos = 0;
} }
@ -75,7 +75,7 @@ static int Pa_Callback(const void *inputBuffer, void *outputBuffer,
s16 *buff_in = (s16 *)inputBuffer; s16 *buff_in = (s16 *)inputBuffer;
s16 *buff_out = &mic->stream_buffer[mic->stream_wpos]; s16 *buff_out = &mic->stream_buffer[mic->stream_wpos];
if (buff_in == NULL) if (buff_in == nullptr)
{ {
for (int i = 0; i < mic->buff_size_samples; i++) for (int i = 0; i < mic->buff_size_samples; i++)
{ {
@ -118,11 +118,13 @@ void CEXIMic::StreamStart()
void CEXIMic::StreamStop() void CEXIMic::StreamStop()
{ {
if (pa_stream != NULL && Pa_IsStreamActive(pa_stream) >= paNoError) if (pa_stream != nullptr && Pa_IsStreamActive(pa_stream) >= paNoError)
Pa_AbortStream(pa_stream); Pa_AbortStream(pa_stream);
samples_avail = stream_wpos = stream_rpos = 0;
delete [] stream_buffer; delete [] stream_buffer;
stream_buffer = NULL; stream_buffer = nullptr;
} }
void CEXIMic::StreamReadOne() void CEXIMic::StreamReadOne()