piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 06:10:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix some wav/mic bugs

Browse Source
This commit is contained in:
StapleButter
2018-12-14 05:48:50 +01:00
parent c7433ca664
commit c0c115a0ee
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libui_sdl/main.cpp
View File

@ -316,7 +316,8 @@ bool JoyButtonPressed(int btnid, int njoybuttons, Uint8* joybuttons, Uint32 hat)
void FeedMicInput() void FeedMicInput()
{ {
int type = Config::MicInputType; int type = Config::MicInputType;
if (type != 1 && MicCommand == 0) if ((type != 1 && MicCommand == 0) ||
(type == 3 && MicWavBuffer == NULL))
{ {
type = 0; type = 0;
MicBufferReadPos = 0; MicBufferReadPos = 0;
@ -692,6 +693,9 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
for (int i = 0; i < 12; i++) for (int i = 0; i < 12; i++)
if (evt->Scancode == Config::KeyMapping[i]) if (evt->Scancode == Config::KeyMapping[i])
KeyInputMask |= (1<<i); KeyInputMask |= (1<<i);
if (evt->Scancode == Config::HKKeyMapping[HK_Mic])
MicCommand &= ~1;
} }
else if (!evt->Repeat) else if (!evt->Repeat)
{ {
@ -722,8 +726,6 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
} }
if (evt->Scancode == Config::HKKeyMapping[HK_Mic]) if (evt->Scancode == Config::HKKeyMapping[HK_Mic])
MicCommand |= 1; MicCommand |= 1;
else
MicCommand &= ~1;
if (evt->Scancode == 0x57) // F11 if (evt->Scancode == 0x57) // F11
NDS::debug(0); NDS::debug(0);