The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-11 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change the order so selected iso will be first and only then the default iso.

Browse Source 
Some other minor cleanup


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4880 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2010-01-18 18:21:27 +00:00
parent 8fec36b22a
commit b5b4d92846
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/AudioCommon/Src/Mixer.h
View File

@ -74,9 +74,9 @@ protected:
bool m_throttle; bool m_throttle;
short m_buffer[MAX_SAMPLES * 2]; short m_buffer[MAX_SAMPLES * 2];
volatile u32 m_numSamples;
u32 m_indexW; u32 m_indexW;
u32 m_indexR; u32 m_indexR;
volatile u32 m_numSamples;
private: private:

5
Source/Core/DolphinWX/Src/FrameAui.cpp
View File

@ -16,11 +16,6 @@
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
// Why doesn't it work on windows?
#ifndef _WIN32
#include "Common.h"
#endif
#include "Setup.h" // Common #include "Setup.h" // Common
#if defined(HAVE_SFML) && HAVE_SFML || defined(_WIN32) #if defined(HAVE_SFML) && HAVE_SFML || defined(_WIN32)

19
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -467,12 +467,11 @@ void CFrame::InitBitmaps()
// Menu items // Menu items
// ---------------------
// Start the game or change the disc. // Start the game or change the disc.
// Boot priority: // Boot priority:
// 1. Default ISO // 1. Show the game list and boot the selected game.
// 2. Show the game list and boot the selected game. // 2. Default ISO
// 3. Boot last selected game // 3. Boot last selected game
void CFrame::BootGame() void CFrame::BootGame()
{ {
@ -481,18 +480,18 @@ void CFrame::BootGame()
if (Core::GetState() != Core::CORE_UNINITIALIZED) if (Core::GetState() != Core::CORE_UNINITIALIZED)
return; return;
// Start the selected ISO, or try one of the saved paths.
// If all that fails, ask to add a dir and don't boot
if (m_GameListCtrl->GetSelectedISO() != NULL)
{
if (m_GameListCtrl->GetSelectedISO()->IsValid())
BootManager::BootCore(m_GameListCtrl->GetSelectedISO()->GetFileName());
}
else if (!StartUp.m_strDefaultGCM.empty() else if (!StartUp.m_strDefaultGCM.empty()
&& wxFileExists(wxString(StartUp.m_strDefaultGCM.c_str(), wxConvUTF8))) && wxFileExists(wxString(StartUp.m_strDefaultGCM.c_str(), wxConvUTF8)))
{ {
BootManager::BootCore(StartUp.m_strDefaultGCM); BootManager::BootCore(StartUp.m_strDefaultGCM);
} }
// Start the selected ISO, or try one of the saved paths.
// If all that fails, ask to add a dir and don't boot
else if (m_GameListCtrl->GetSelectedISO() != NULL)
{
if (m_GameListCtrl->GetSelectedISO()->IsValid())
BootManager::BootCore(m_GameListCtrl->GetSelectedISO()->GetFileName());
}
else else
{ {
if (!SConfig::GetInstance().m_LastFilename.empty() if (!SConfig::GetInstance().m_LastFilename.empty()

2
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -777,7 +777,7 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
} }
if (!ret) if (!ret)
PanicAlert("Failed to extract to %s!", Path.mb_str()); PanicAlert("Failed to extract to %s!", (const char *)Path.mb_str());
} }
void CISOProperties::SetRefresh(wxCommandEvent& event) void CISOProperties::SetRefresh(wxCommandEvent& event)