summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2016-01-02 14:45:41 -0500
committerLioncash <mathew1800@gmail.com>2016-01-02 14:57:55 -0500
commitedda018d543bf80cd70fa2c2952e2425c650f26e (patch)
treec8437368683d7cc4ad6301468000ae2c65e1151c /Source/Core/VideoCommon
parent066af14272a87870bbb84280249cf938d9eba336 (diff)
OnScreenDisplay: Make CallbackType an enum class
Diffstat (limited to 'Source/Core/VideoCommon')
-rw-r--r--Source/Core/VideoCommon/OnScreenDisplay.cpp2
-rw-r--r--Source/Core/VideoCommon/OnScreenDisplay.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp
index dfd597f0ed..ebce4f79ea 100644
--- a/Source/Core/VideoCommon/OnScreenDisplay.cpp
+++ b/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();
}
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.h b/Source/Core/VideoCommon/OnScreenDisplay.h
index 17a5494345..8bf6852061 100644
--- a/Source/Core/VideoCommon/OnScreenDisplay.h
+++ b/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);