diff options
| author | Lioncash <mathew1800@gmail.com> | 2016-01-02 14:45:41 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2016-01-02 14:57:55 -0500 |
| commit | edda018d543bf80cd70fa2c2952e2425c650f26e (patch) | |
| tree | c8437368683d7cc4ad6301468000ae2c65e1151c /Source/Core/VideoBackends | |
| parent | 066af14272a87870bbb84280249cf938d9eba336 (diff) | |
OnScreenDisplay: Make CallbackType an enum class
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWRenderer.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index a311420477..7b3895d5aa 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1520,7 +1520,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 diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 2e14a3643a..eb388b9eea 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -165,7 +165,7 @@ bool VideoBackend::Initialize(void *window_handle) return false; // Do our OSD callbacks - OSD::DoCallbacks(OSD::OSD_INIT); + OSD::DoCallbacks(OSD::CallbackType::Initialization); s_BackendInitialized = true; @@ -209,7 +209,7 @@ void VideoBackend::Shutdown() s_BackendInitialized = false; // Do our OSD callbacks - OSD::DoCallbacks(OSD::OSD_SHUTDOWN); + OSD::DoCallbacks(OSD::CallbackType::Shutdown); GLInterface->Shutdown(); GLInterface.reset(); diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index c30b34720f..3eeed2958b 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/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(); diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index c891542d8a..ddab028435 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -150,7 +150,7 @@ void VideoSoftware::Shutdown() DebugUtil::Shutdown(); // Do our OSD callbacks - OSD::DoCallbacks(OSD::OSD_SHUTDOWN); + OSD::DoCallbacks(OSD::CallbackType::Shutdown); SWOGLWindow::Shutdown(); } @@ -163,7 +163,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(); |
