Merge pull request #3434 from lioncash/enum

OnScreenDisplay: Make CallbackType an enum class

Source/Core/DolphinWX/MainAndroid.cpp

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

Source/Core/VideoBackends/OGL/Render.cpp

@@ -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

Source/Core/VideoBackends/OGL/main.cpp

@@ -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();

Source/Core/VideoBackends/Software/SWRenderer.cpp

@@ -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();
 

Source/Core/VideoBackends/Software/SWmain.cpp

@@ -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();
 

Source/Core/VideoCommon/OnScreenDisplay.cpp

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

Source/Core/VideoCommon/OnScreenDisplay.h

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