diff options
| author | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-06-08 00:14:48 +0000 |
|---|---|---|
| committer | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-06-08 00:14:48 +0000 |
| commit | c779f95b87da8cdb451035c2d52016ed7e271459 (patch) | |
| tree | 1b0d588ffe7658c78f327bbaaceb2f4685840219 /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | c9b5fbd9bd88a3b5f181d691d424cebd9f4807a4 (diff) | |
-Wii System Menu now recognizes DVDs using the Load Disc/Eject feature!
Games hang though (probably due to unknown ES call)
-/dev/di IPC: Cleaned up code and fixed a bug (which I used to accidentally find out what I did), added Volume eject feature for VolumeHandler.
-Partially documented Wii DVD cover flags.
-Files opened in Wii Read-Write mode are now set to append.
-Removed annoying overhead-ish "Idle" log message.
As for /dev/di: Someone clearly didn't know what he was doing in that file. Someone freed memory which didn't belong to that file and then complained about a crash. Needless to say the problem is now solved.
Big TODO on the /dev/di code though, ExecuteCommand is practically doing nothing but reading.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3365 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index d8595ab198..6ae91d6816 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -131,7 +131,7 @@ void CFrame::CreateMenu() // Emulation menu wxMenu* emulationMenu = new wxMenu; emulationMenu->Append(IDM_PLAY, _T("&Play")); - emulationMenu->Append(IDM_CHANGEDISC, _T("Change Disc")); + emulationMenu->Append(IDM_CHANGEDISC, _T("Load Disc")); emulationMenu->Append(IDM_STOP, _T("&Stop")); emulationMenu->AppendSeparator(); wxMenu *saveMenu = new wxMenu; @@ -485,10 +485,17 @@ void CFrame::DoOpen(bool Boot) void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event)) { + if(VolumeHandler::IsValid()) { + VolumeHandler::EjectVolume(); + GetMenuBar()->FindItem(IDM_CHANGEDISC)->SetText("Load Disc"); + return; + } + DVDInterface::SetLidOpen(true); DoOpen(false); DVDInterface::SetLidOpen(false); DVDInterface::SetDiscInside(true); + GetMenuBar()->FindItem(IDM_CHANGEDISC)->SetText("Eject"); } void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event)) |