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

Merge pull request #3434 from lioncash/enum

Browse Source 
OnScreenDisplay: Make CallbackType an enum class
This commit is contained in:
Markus Wick
2016-01-04 13:47:22 +01:00
parent 3045e08daf edda018d54
commit ca7160f714
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -1511,7 +1511,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
DrawDebugText();
// Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_ONFRAME);
OSD::DoCallbacks(OSD::CallbackType::OnFrame);
OSD::DrawMessages();
// Copy the rendered frame to the real window

4
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -157,7 +157,7 @@ bool VideoBackend::Initialize(void* window_handle)
return false;
// Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_INIT);
OSD::DoCallbacks(OSD::CallbackType::Initialization);
m_initialized = true;
@ -201,7 +201,7 @@ void VideoBackend::Shutdown()
m_initialized = false;
// Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
OSD::DoCallbacks(OSD::CallbackType::Shutdown);
GLInterface->Shutdown();
GLInterface.reset();

2
Source/Core/VideoBackends/Software/SWRenderer.cpp
View File

@ -150,7 +150,7 @@ void SWRenderer::Swap(u32 fbWidth, u32 fbHeight)
s_bScreenshot.store(false);
}
OSD::DoCallbacks(OSD::OSD_ONFRAME);
OSD::DoCallbacks(OSD::CallbackType::OnFrame);
DrawDebugText();

4
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -153,7 +153,7 @@ void VideoSoftware::Shutdown()
DebugUtil::Shutdown();
// Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_SHUTDOWN);
OSD::DoCallbacks(OSD::CallbackType::Shutdown);
SWOGLWindow::Shutdown();
}
@ -166,7 +166,7 @@ void VideoSoftware::Video_Cleanup()
void VideoSoftware::Video_Prepare()
{
// Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_INIT);
OSD::DoCallbacks(OSD::CallbackType::Initialization);
SWRenderer::Prepare();