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

Solved issue 1096 and issue 1098 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3780 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-07-13 13:37:52 +00:00
parent 4da0457524
commit e7a5f0fa3d
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -1801,12 +1801,12 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandDisconnect(u8* _Input)
ERROR_LOG(WII_IPC_WIIMOTE, "IPC CommandDisconnect: WiiMote emulation is out of sync.\n" ERROR_LOG(WII_IPC_WIIMOTE, "IPC CommandDisconnect: WiiMote emulation is out of sync.\n"
"This message will be shot one time only, because dolphin does\n" "This message will be shot one time only, because dolphin does\n"
"not executes the disconnect at all and some times you can play\n" "not executes the disconnect at all and some times you can play\n"
"anyway. It is strongly recommed to save and/or restart the\n" "anyway. It is strongly recommended to save and/or restart the\n"
"emulation."); "emulation.");
PanicAlert("IPC CommandDisconnect: WiiMote emulation is out of sync.\n" PanicAlert("IPC CommandDisconnect: WiiMote emulation is out of sync.\n"
"This message will be shot one time only, because dolphin does\n" "This message will be shot one time only, because dolphin does\n"
"not executes the disconnect at all and some times you can play\n" "not executes the disconnect at all and some times you can play\n"
"anyway. It is strongly recommed to save and/or restart the\n" "anyway. It is strongly recommended to save and/or restart the\n"
"emulation."); "emulation.");
} }
INFO_LOG(CONSOLE, "IPC CommandDisconnect\n"); INFO_LOG(CONSOLE, "IPC CommandDisconnect\n");

5
Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
View File

@ -113,6 +113,11 @@ void DSPConfigDialogHLE::AddBackend(const char* backend)
#endif #endif
} }
void DSPConfigDialogHLE::ClearBackends()
{
m_BackendSelection->Clear();
}
DSPConfigDialogHLE::~DSPConfigDialogHLE() DSPConfigDialogHLE::~DSPConfigDialogHLE()
{ {
} }

1
Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h
View File

@ -35,6 +35,7 @@ public:
long style = wxDEFAULT_DIALOG_STYLE); long style = wxDEFAULT_DIALOG_STYLE);
virtual ~DSPConfigDialogHLE(); virtual ~DSPConfigDialogHLE();
void AddBackend(const char *backend); void AddBackend(const char *backend);
void ClearBackends();
private: private:
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();

2
Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
View File

@ -176,6 +176,8 @@ void DllConfig(HWND _hParent)
else if (!m_ConfigFrame->GetParent()->IsShown()) else if (!m_ConfigFrame->GetParent()->IsShown())
m_ConfigFrame->Close(true); m_ConfigFrame->Close(true);
m_ConfigFrame->ClearBackends();
// add backends // add backends
std::vector<std::string> backends = AudioCommon::GetSoundBackends(); std::vector<std::string> backends = AudioCommon::GetSoundBackends();

6
docs/DSP/DSP_UC_Zelda.txt
View File

@ -3680,16 +3680,16 @@ void 0ab3_Decoder0x21Core(AC1.M, AR3) {
// 0abb 0292 0ad1 jg 0x0ad1 // 0abb 0292 0ad1 jg 0x0ad1
if ([0x043a,0x043b] > AC1.M) { if ([0x043a,0x043b] <= AC1.M) {
// Happens when sound has finished playing? // Happens when sound has finished playing?
// 0abd 8900 clr $ACC1 // 0abd 8900 clr $ACC1
// 0abe 00c0 043b lr $AR0, @0x043b // 0abe 00c0 043b lr $AR0, @0x043b
ACC1 = 0; ACC1 = 0;
AR0 = 0x043b; AR0 = *0x043b;
// 0ac0 02bf 0af6 call 0x0af6 // 0af6_Decoder0x21_MoreStuff() // 0ac0 02bf 0af6 call 0x0af6 // 0af6_Decoder0x21_MoreStuff()
0af6_Decoder0x21_MoreStuff(AR0=0x043b, AR3); 0af6_Decoder0x21_MoreStuff(AR0=*0x043b, AR3);
// 0ac2 8100 clr $ACC0 // 0ac2 8100 clr $ACC0
// 0ac3 1fd8 mrr $AC0.M, $AX0.L // 0ac3 1fd8 mrr $AC0.M, $AX0.L