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

ok...just need to update the button...

Browse Source
This commit is contained in:
Shawn Hoffman
2011-10-04 03:29:01 -07:00
parent a751b627fd
commit ade9485aac
6 changed files with 394 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ void CEXIMic::StreamInit()
void CEXIMic::StreamTerminate()
{
if (pa_init && --mic_count <= 0)
if (--mic_count <= 0 && pa_init)
pa_error = Pa_Terminate();
if (pa_error != paNoError)
@ -98,15 +98,17 @@ void CEXIMic::StreamReadOne()
{
pa_error = Pa_ReadStream(pa_stream, ring_buffer, buff_size_samples);
if (pa_error != paNoError)
if (pa_error == paInputOverflowed)
{
status.buff_ovrflw = 1;
// Input overflowed - is re-setting the stream the only to recover?
StreamLog("Pa_ReadStream");
StreamStop();
StreamStart();
}
else if (pa_error != paNoError)
{
StreamLog("Pa_ReadStream");
}
}
}
@ -125,10 +127,17 @@ int CEXIMic::mic_count = 0;
CEXIMic::CEXIMic()
{
status.U16 = 0;
command = 0;
m_position = 0;
command = 0;
status.U16 = 0;
sample_rate = rate_base;
buff_size = ring_base;
buff_size_samples = buff_size / sample_size;
ring_pos = 0;
memset(ring_buffer, 0, sizeof(ring_buffer));
next_int_ticks = 0;
StreamInit();
@ -194,7 +203,11 @@ void CEXIMic::TransferByte(u8 &byte)
break;
case cmdGetStatus:
if (pos == 0)
status.button = 0;// TODO
byte = status.U8[pos ^ 1];
if (pos == 1 && status.buff_ovrflw)
status.buff_ovrflw = 0;
break;

4
Source/Core/Core/Src/HW/EXI_DeviceMic.h
View File

@ -55,7 +55,9 @@ private:
struct
{
u16 out :4; // MICSet/GetOut...???
u16 button :5; // Buttons. Top bit is mic button. Lowest bit is used for MICGetDeviceID (always 0)
u16 id :1; // Used for MICGetDeviceID (always 0)
u16 button_unk :3; // Button bits which appear unused
u16 button :1; // The actual button on the mic
u16 buff_ovrflw :1; // Ring buffer wrote over bytes which weren't read by console
u16 gain :1; // Gain: 0dB or 15dB
u16 sample_rate :2; // Sample rate, 00-11025, 01-22050, 10-44100, 11-??