diff options
Diffstat (limited to 'src/osd/modules/monitor/monitor_dxgi.cpp')
-rw-r--r-- | src/osd/modules/monitor/monitor_dxgi.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/osd/modules/monitor/monitor_dxgi.cpp b/src/osd/modules/monitor/monitor_dxgi.cpp index 3eadadced24..d4ab80d2f33 100644 --- a/src/osd/modules/monitor/monitor_dxgi.cpp +++ b/src/osd/modules/monitor/monitor_dxgi.cpp @@ -5,11 +5,10 @@ * */ -#include "emu.h" #include "modules/osdmodule.h" #include "monitor_module.h" -#if defined(OSD_WINDOWS) || defined(OSD_UWP) +#if defined(OSD_WINDOWS) // standard windows headers #include <windows.h> @@ -20,6 +19,7 @@ #include "strconv.h" #include "modules/lib/osdlib.h" #include "monitor_common.h" +#include "osdcore.h" #include "window.h" #include "windows/video.h" @@ -79,7 +79,6 @@ public: if (!m_initialized) return nullptr; -#if defined(OSD_WINDOWS) RECT p; p.top = rect.top(); p.left = rect.left(); @@ -89,13 +88,6 @@ public: auto nearest = monitor_from_handle(reinterpret_cast<std::uintptr_t>(MonitorFromRect(&p, MONITOR_DEFAULTTONEAREST))); assert(nearest != nullptr); return nearest; -#elif defined(OSD_UWP) - if (list().size() == 0) - return nullptr; - - // For now just return first monitor - return list()[0]; -#endif } // Currently this method implementation is duplicated from the win32 module @@ -105,17 +97,9 @@ public: if (!m_initialized) return nullptr; -#if defined(OSD_WINDOWS) auto nearest = monitor_from_handle(reinterpret_cast<std::uintptr_t>(MonitorFromWindow(static_cast<const win_window_info &>(window).platform_window(), MONITOR_DEFAULTTONEAREST))); assert(nearest != nullptr); return nearest; -#elif defined(OSD_UWP) - if (list().size() == 0) - return nullptr; - - // For now just return first monitor - return list()[0]; -#endif } protected: @@ -164,9 +148,9 @@ protected: // if we're verbose, print the list of monitors { - for (auto monitor : list()) + for (const auto &monitor : list()) { - osd_printf_verbose("Video: Monitor %I64u = \"%s\" %s\n", monitor->oshandle(), monitor->devicename().c_str(), monitor->is_primary() ? "(primary)" : ""); + osd_printf_verbose("Video: Monitor %u = \"%s\" %s\n", monitor->oshandle(), monitor->devicename(), monitor->is_primary() ? "(primary)" : ""); } } |