archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages 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
commit ca7160f714
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/DolphinWX/MainAndroid.cpp
View file

@ -609,8 +609,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *
} }
// Install our callbacks // Install our callbacks
OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init); OSD::AddCallback(OSD::CallbackType::Initialization, ButtonManager::Init);
OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown); OSD::AddCallback(OSD::CallbackType::Shutdown, ButtonManager::Shutdown);
RegisterMsgAlertHandler(&MsgAlert); RegisterMsgAlertHandler(&MsgAlert);

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(); DrawDebugText();
// Do our OSD callbacks // Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_ONFRAME); OSD::DoCallbacks(OSD::CallbackType::OnFrame);
OSD::DrawMessages(); OSD::DrawMessages();
// Copy the rendered frame to the real window // 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; return false;
// Do our OSD callbacks // Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_INIT); OSD::DoCallbacks(OSD::CallbackType::Initialization);
m_initialized = true; m_initialized = true;
@ -201,7 +201,7 @@ void VideoBackend::Shutdown()
m_initialized = false; m_initialized = false;
// Do our OSD callbacks // Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_SHUTDOWN); OSD::DoCallbacks(OSD::CallbackType::Shutdown);
GLInterface->Shutdown(); GLInterface->Shutdown();
GLInterface.reset(); 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); s_bScreenshot.store(false);
} }
OSD::DoCallbacks(OSD::OSD_ONFRAME); OSD::DoCallbacks(OSD::CallbackType::OnFrame);
DrawDebugText(); DrawDebugText();

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

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

2
Source/Core/VideoCommon/OnScreenDisplay.cpp
View file

@ -83,7 +83,7 @@ void DoCallbacks(CallbackType type)
} }
// Wipe all callbacks on shutdown // Wipe all callbacks on shutdown
if (type == OSD_SHUTDOWN) if (type == CallbackType::Shutdown)
s_callbacks.clear(); s_callbacks.clear();
} }

10
Source/Core/VideoCommon/OnScreenDisplay.h
View file

@ -17,13 +17,13 @@ void DrawMessages(); // draw the current messages on the screen. Only call once
void ClearMessages(); void ClearMessages();
// On-screen callbacks // On-screen callbacks
enum CallbackType enum class CallbackType
{ {
OSD_INIT = 0, Initialization,
OSD_ONFRAME, OnFrame,
OSD_SHUTDOWN Shutdown
}; };
typedef std::function<void()> Callback; using Callback = std::function<void()>;
void AddCallback(CallbackType type, Callback cb); void AddCallback(CallbackType type, Callback cb);
void DoCallbacks(CallbackType type); void DoCallbacks(CallbackType type);