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

Some fixes to Stop() process.

Browse Source 
Unbreak linux stop on Single Core, remove an unnecessary wait event, fix DSP HLE/DSP LLE/OGL plugin hang on stop when the config dialog has been opened (nJoy and Wiimote still need to be fixed), avoid the CpuThread to be stuck in the efb/swap loop by setting a flag before the thread is actually shutdown (contrary to r4756 which was setting it.. after :D)
Clear the status bar Framerate/Core message when the game is stopped.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4769 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2010-01-01 03:55:39 +00:00
parent 25abd0f944
commit 5877961354
8 changed files with 113 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,26 +176,24 @@ void DllConfig(HWND _hParent)
g_Config.GameIniLoad(globals->game_ini);
if (!m_ConfigFrame)
m_ConfigFrame = new DSPConfigDialogHLE(GetParentedWxWindow(_hParent));
else if (!m_ConfigFrame->GetParent()->IsShown())
m_ConfigFrame->Close(true);
m_ConfigFrame->ClearBackends();
// add backends
std::vector<std::string> backends = AudioCommon::GetSoundBackends();
for (std::vector<std::string>::const_iterator iter = backends.begin();
iter != backends.end(); ++iter)
{
m_ConfigFrame->AddBackend((*iter).c_str());
}
m_ConfigFrame = new DSPConfigDialogHLE(GetParentedWxWindow(_hParent));
// Only allow one open at a time
if (!m_ConfigFrame->IsShown())
// add backends
std::vector<std::string> backends = AudioCommon::GetSoundBackends();
for (std::vector<std::string>::const_iterator iter = backends.begin();
iter != backends.end(); ++iter)
{
m_ConfigFrame->AddBackend((*iter).c_str());
}
// Only allow one open at a time
m_ConfigFrame->ShowModal();
else
m_ConfigFrame->Hide();
delete m_ConfigFrame;
m_ConfigFrame = 0;
}
#endif
}
@ -358,5 +356,5 @@ void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples)
void DSP_ClearAudioBuffer()
{
if (soundStream)
soundStream->Clear(*g_dspInitialize.pEmulatorState);
soundStream->Clear(!!*g_dspInitialize.pEmulatorState);
}

26
Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
View File

@ -142,24 +142,24 @@ void DllConfig(HWND _hParent)
{
#if defined(HAVE_WX) && HAVE_WX
if (!m_ConfigFrame)
{
m_ConfigFrame = new DSPConfigDialogLLE(GetParentedWxWindow(_hParent));
else if (!m_ConfigFrame->GetParent()->IsShown())
m_ConfigFrame->Close(true);
m_ConfigFrame->ClearBackends();
// add backends
std::vector<std::string> backends = AudioCommon::GetSoundBackends();
// add backends
std::vector<std::string> backends = AudioCommon::GetSoundBackends();
for (std::vector<std::string>::const_iterator iter = backends.begin();
iter != backends.end(); ++iter) {
m_ConfigFrame->AddBackend((*iter).c_str());
}
for (std::vector<std::string>::const_iterator iter = backends.begin();
iter != backends.end(); ++iter)
{
m_ConfigFrame->AddBackend((*iter).c_str());
}
// Only allow one open at a time
if (!m_ConfigFrame->IsShown())
// Only allow one open at a time
m_ConfigFrame->ShowModal();
else
m_ConfigFrame->Hide();
delete m_ConfigFrame;
m_ConfigFrame = 0;
}
#endif
}

16
Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp
View File

@ -115,8 +115,12 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
case WM_CLOSE:
// When the user closes the window, we post an event to the main window to call Stop()
// Which then handles all the necessary steps to Shutdown the core + the plugins
PostMessage( m_hMain, WM_USER, WM_USER_STOP, 0 );
return 0;
if (m_hParent == NULL)
{
PostMessage( m_hMain, WM_USER, WM_USER_STOP, 0 );
return 0;
}
break;
case WM_USER:
// if (wParam == TOGGLE_FULLSCREEN)
@ -170,6 +174,7 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T
else
{
m_hMain = parent;
m_hParent = NULL;
DWORD style = g_Config.bFullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW;
@ -208,8 +213,11 @@ HWND Create(HWND hParent, HINSTANCE hInstance, const TCHAR *title)
void Close()
{
DestroyWindow(m_hWnd);
UnregisterClass(m_szClassName, m_hInstance);
if (m_hWnd && !g_Config.RenderToMainframe)
{
DestroyWindow(m_hWnd);
UnregisterClass(m_szClassName, m_hInstance);
}
}
void SetSize(int width, int height)

11
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -68,7 +68,9 @@ PLUGIN_GLOBALS* globals = NULL;
bool s_initialized;
static u32 s_efbAccessRequested = FALSE;
static u32 s_FifoShuttingDown = FALSE;
static bool s_swapRequested = false;
static volatile struct
{
u32 xfbAddr;
@ -261,6 +263,10 @@ void Initialize(void *init)
void Video_Prepare()
{
// Better be safe...
s_efbAccessRequested = FALSE;
s_FifoShuttingDown = FALSE;
Renderer::Init();
TextureCache::Init();
BPInit();
@ -279,6 +285,7 @@ void Video_Prepare()
void Shutdown()
{
s_efbAccessRequested = FALSE;
s_FifoShuttingDown = FALSE;
Fifo_Shutdown();
VertexManager::Shutdown();
@ -311,6 +318,8 @@ void Video_EnterLoop()
void Video_ExitLoop()
{
Fifo_ExitLoop();
s_FifoShuttingDown = TRUE;
}
void Video_SetRendering(bool bEnabled) {
@ -451,7 +460,7 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y)
if (g_VideoInitialize.bOnThread)
{
while (Common::AtomicLoadAcquire(s_efbAccessRequested) && s_initialized)
while (Common::AtomicLoadAcquire(s_efbAccessRequested) && !s_FifoShuttingDown)
Common::YieldCPU();
}
else

40
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -107,6 +107,7 @@ static bool s_PluginInitialized = false;
static u32 s_swapRequested = FALSE;
static u32 s_efbAccessRequested = FALSE;
static u32 s_FifoShuttingDown = FALSE;
static bool ForceSwap = true;
bool IsD3D()
@ -295,8 +296,9 @@ void DllConfig(HWND _hParent)
g_Config.UpdateProjectionHack();
UpdateActiveConfig();
#if defined(HAVE_WX) && HAVE_WX
// Prevent user to show more than 1 config window at same time
if (allowConfigShow) {
// Prevent user to show more than 1 config window at same time
if (allowConfigShow)
{
m_ConfigFrame = new GFXConfigDialogOGL(GetParentedWxWindow(_hParent));
#if defined(_WIN32)
@ -307,15 +309,18 @@ void DllConfig(HWND _hParent)
CocaAddResolutions();
#endif
// CreateGUIControls() will crash because the array is empty.
if (m_ConfigFrame->arrayStringFor_FullscreenCB.size() == 0) {
m_ConfigFrame->AddFSReso("<No resolutions found>");
m_ConfigFrame->AddWindowReso("<No resolutions found>");
}
allowConfigShow = false;
m_ConfigFrame->CreateGUIControls();
allowConfigShow = m_ConfigFrame->ShowModal() == 1 ? true : false;
// CreateGUIControls() will crash because the array is empty.
if (m_ConfigFrame->arrayStringFor_FullscreenCB.size() == 0) {
m_ConfigFrame->AddFSReso("<No resolutions found>");
m_ConfigFrame->AddWindowReso("<No resolutions found>");
}
allowConfigShow = false;
m_ConfigFrame->CreateGUIControls();
allowConfigShow = m_ConfigFrame->ShowModal() == 1 ? true : false;
delete m_ConfigFrame;
m_ConfigFrame = 0;
}
#endif
}
@ -382,6 +387,10 @@ void Video_Prepare(void)
exit(1);
}
s_swapRequested = FALSE;
s_efbAccessRequested = FALSE;
s_FifoShuttingDown = FALSE;
CommandProcessor::Init();
PixelEngine::Init();
@ -400,8 +409,6 @@ void Video_Prepare(void)
VertexLoaderManager::Init();
TextureConverter::Init();
DLCache::Init();
s_swapRequested = FALSE;
s_efbAccessRequested = FALSE;
s_PluginInitialized = true;
INFO_LOG(VIDEO, "Video plugin initialized.");
@ -414,6 +421,7 @@ void Shutdown(void)
s_efbAccessRequested = FALSE;
s_swapRequested = FALSE;
s_FifoShuttingDown = FALSE;
DLCache::Shutdown();
Fifo_Shutdown();
@ -443,6 +451,8 @@ void Video_EnterLoop()
void Video_ExitLoop()
{
Fifo_ExitLoop();
s_FifoShuttingDown = TRUE;
}
// Screenshot and screen message
@ -517,7 +527,7 @@ void Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
// Make sure previous swap request has made it to the screen
if (g_VideoInitialize.bOnThread)
{
while (Common::AtomicLoadAcquire(s_swapRequested) && s_PluginInitialized)
while (Common::AtomicLoadAcquire(s_swapRequested) && !s_FifoShuttingDown)
Common::YieldCPU();
}
else
@ -570,7 +580,7 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y)
if (g_VideoInitialize.bOnThread)
{
while (Common::AtomicLoadAcquire(s_efbAccessRequested) && s_PluginInitialized)
while (Common::AtomicLoadAcquire(s_efbAccessRequested) && !s_FifoShuttingDown)
Common::YieldCPU();
}
else