Merge pull request #17649 from hrydgard/osd-data-split-file

Break out the OSD data holder from Common/System/System.h, into OSD.cpp/h

CMakeLists.txt

@@ -744,6 +744,8 @@ add_library(Common STATIC
 	Common/System/NativeApp.h
 	Common/System/Request.cpp
 	Common/System/Request.h
+	Common/System/OSD.cpp
+	Common/System/OSD.h
 	Common/Thread/Channel.h
 	Common/Thread/ParallelLoop.cpp
 	Common/Thread/ParallelLoop.h

Common/Common.vcxproj

@@ -561,6 +561,7 @@
     <ClInclude Include="Swap.h" />
     <ClInclude Include="SysError.h" />
     <ClInclude Include="System\Display.h" />
+    <ClInclude Include="System\OSD.h" />
     <ClInclude Include="System\Request.h" />
     <ClInclude Include="System\NativeApp.h" />
     <ClInclude Include="System\System.h" />
@@ -1022,6 +1023,7 @@
     <ClCompile Include="OSVersion.cpp" />
     <ClCompile Include="StringUtils.cpp" />
     <ClCompile Include="System\Display.cpp" />
+    <ClCompile Include="System\OSD.cpp" />
     <ClCompile Include="System\Request.cpp" />
     <ClCompile Include="Thread\ParallelLoop.cpp" />
     <ClCompile Include="Thread\ThreadManager.cpp" />

Common/Common.vcxproj.filters

@@ -509,6 +509,9 @@
     <ClInclude Include="UI\IconCache.h">
       <Filter>UI</Filter>
     </ClInclude>
+    <ClInclude Include="System\OSD.h">
+      <Filter>System</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
@@ -953,6 +956,9 @@
     <ClCompile Include="UI\IconCache.cpp">
       <Filter>UI</Filter>
     </ClCompile>
+    <ClCompile Include="System\OSD.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">

Common/System/OSD.cpp

@@ -0,0 +1,141 @@
+#include <cstring>
+
+#include "Common/System/OSD.h"
+#include "Common/TimeUtil.h"
+
+OnScreenDisplay g_OSD;
+
+void OnScreenDisplay::Update() {
+	std::lock_guard<std::mutex> guard(mutex_);
+
+	double now = time_now_d();
+	for (auto iter = entries_.begin(); iter != entries_.end(); ) {
+		if (now >= iter->endTime) {
+			iter = entries_.erase(iter);
+		} else {
+			iter++;
+		}
+	}
+
+	for (auto iter = bars_.begin(); iter != bars_.end(); ) {
+		if (now >= iter->endTime) {
+			iter = bars_.erase(iter);
+		} else {
+			iter++;
+		}
+	}
+}
+
+std::vector<OnScreenDisplay::Entry> OnScreenDisplay::Entries() {
+	std::lock_guard<std::mutex> guard(mutex_);
+	return entries_;  // makes a copy.
+}
+
+std::vector<OnScreenDisplay::ProgressBar> OnScreenDisplay::ProgressBars() {
+	std::lock_guard<std::mutex> guard(mutex_);
+	return bars_;  // makes a copy.
+}
+
+void OnScreenDisplay::Show(OSDType type, const std::string &text, const std::string &text2, const std::string &icon, float duration_s, const char *id) {
+	// Automatic duration based on type.
+	if (duration_s <= 0.0f) {
+		switch (type) {
+		case OSDType::MESSAGE_ERROR:
+		case OSDType::MESSAGE_WARNING:
+			duration_s = 3.0f;
+			break;
+		case OSDType::MESSAGE_FILE_LINK:
+			duration_s = 5.0f;
+			break;
+		case OSDType::MESSAGE_SUCCESS:
+			duration_s = 2.0f;
+			break;
+		default:
+			duration_s = 1.5f;
+			break;
+		}
+	}
+
+	double now = time_now_d();
+	std::lock_guard<std::mutex> guard(mutex_);
+	if (id) {
+		for (auto iter = entries_.begin(); iter != entries_.end(); ++iter) {
+			if (iter->id && !strcmp(iter->id, id)) {
+				Entry msg = *iter;
+				msg.endTime = now + duration_s;
+				msg.text = text;
+				msg.text2 = text2;
+				msg.type = type;
+				msg.iconName = icon;
+				// Move to top (should we? maybe not?)
+				entries_.erase(iter);
+				entries_.insert(entries_.begin(), msg);
+				return;
+			}
+		}
+	}
+
+	Entry msg;
+	msg.text = text;
+	msg.text2 = text2;
+	msg.iconName = icon;
+	msg.startTime = now;
+	msg.endTime = now + duration_s;
+	msg.type = type;
+	msg.id = id;
+	entries_.insert(entries_.begin(), msg);
+}
+
+void OnScreenDisplay::ShowAchievementUnlocked(int achievementID) {
+	double now = time_now_d();
+
+	double duration_s = 5.0;
+
+	Entry msg;
+	msg.numericID = achievementID;
+	msg.type = OSDType::ACHIEVEMENT_UNLOCKED;
+	msg.startTime = now;
+	msg.endTime = now + duration_s;
+	entries_.insert(entries_.begin(), msg);
+}
+
+void OnScreenDisplay::ShowOnOff(const std::string &message, bool on, float duration_s) {
+	// TODO: translate "on" and "off"? Or just get rid of this whole thing?
+	Show(OSDType::MESSAGE_INFO, message + ": " + (on ? "on" : "off"), duration_s);
+}
+
+void OnScreenDisplay::SetProgressBar(std::string id, std::string &&message, int minValue, int maxValue, int progress) {
+	std::lock_guard<std::mutex> guard(mutex_);
+	double now = time_now_d();
+	bool found = false;
+	for (auto &bar : bars_) {
+		if (bar.id == id) {
+			bar.minValue = minValue;
+			bar.maxValue = maxValue;
+			bar.progress = progress;
+			bar.message = message;
+			bar.endTime = now + 60.0;  // Nudge the progress bar to keep it shown.
+			return;
+		}
+	}
+
+	ProgressBar bar;
+	bar.id = id;
+	bar.message = std::move(message);
+	bar.minValue = minValue;
+	bar.maxValue = maxValue;
+	bar.progress = progress;
+	bar.endTime = now + 60.0;  // Show the progress bar for 60 seconds, then fade it out.
+	bars_.push_back(bar);
+}
+
+void OnScreenDisplay::RemoveProgressBar(std::string id, float fadeout_s) {
+	std::lock_guard<std::mutex> guard(mutex_);
+	for (auto iter = bars_.begin(); iter != bars_.end(); iter++) {
+		if (iter->id == id) {
+			iter->progress = iter->maxValue;
+			iter->endTime = time_now_d() + (double)fadeout_s;
+			break;
+		}
+	}
+}

Common/System/OSD.h

@@ -0,0 +1,77 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <mutex>
+
+// Shows a visible message to the user.
+// The default implementation in NativeApp.cpp uses our "osm" system (on screen messaging).
+enum class OSDType {
+	MESSAGE_INFO,
+	MESSAGE_SUCCESS,
+	MESSAGE_WARNING,
+	MESSAGE_ERROR,
+	MESSAGE_ERROR_DUMP,  // displays lots of text (after the first line), small size
+	MESSAGE_FILE_LINK,
+
+	ACHIEVEMENT_UNLOCKED,
+
+	// PROGRESS_BAR,
+	// PROGRESS_INDETERMINATE,
+};
+
+// Data holder for on-screen messages.
+class OnScreenDisplay {
+public:
+	// If you specify 0.0f as duration, a duration will be chosen automatically depending on type.
+	void Show(OSDType type, const std::string &text, float duration_s = 0.0f, const char *id = nullptr) {
+		Show(type, text, "", duration_s, id);
+	}
+	void Show(OSDType type, const std::string &text, const std::string &text2, float duration_s = 0.0f, const char *id = nullptr) {
+		Show(type, text, text2, "", duration_s, id);
+	}
+	void Show(OSDType type, const std::string &text, const std::string &text2, const std::string &icon, float duration_s = 0.0f, const char *id = nullptr);
+	void ShowAchievementUnlocked(int achievementID);
+
+	void ShowOnOff(const std::string &message, bool on, float duration_s = 0.0f);
+
+	bool IsEmpty() const { return entries_.empty(); }  // Shortcut to skip rendering.
+
+	// Call this every frame, cleans up old entries.
+	void Update();
+
+	// Progress bar controls
+	// Set is both create and update.
+	void SetProgressBar(std::string id, std::string &&message, int minValue, int maxValue, int progress);
+	void RemoveProgressBar(std::string id, float fadeout_s);
+
+	struct Entry {
+		OSDType type;
+		std::string text;
+		std::string text2;
+		std::string iconName;
+		int numericID;
+		const char *id;
+		double startTime;
+		double endTime;
+	};
+
+	struct ProgressBar {
+		std::string id;
+		std::string message;
+		int minValue;
+		int maxValue;
+		int progress;
+		double endTime;
+	};
+
+	std::vector<Entry> Entries();
+	std::vector<ProgressBar> ProgressBars();
+
+private:
+	std::vector<Entry> entries_;
+	std::vector<ProgressBar> bars_;
+	std::mutex mutex_;
+};
+
+extern OnScreenDisplay g_OSD;

Common/System/Request.cpp

@@ -7,142 +7,6 @@
 #include "Common/TimeUtil.h"
 
 RequestManager g_requestManager;
-OnScreenDisplay g_OSD;
-
-void OnScreenDisplay::Update() {
-	std::lock_guard<std::mutex> guard(mutex_);
-
-	double now = time_now_d();
-	for (auto iter = entries_.begin(); iter != entries_.end(); ) {
-		if (now >= iter->endTime) {
-			iter = entries_.erase(iter);
-		} else {
-			iter++;
-		}
-	}
-
-	for (auto iter = bars_.begin(); iter != bars_.end(); ) {
-		if (now >= iter->endTime) {
-			iter = bars_.erase(iter);
-		} else {
-			iter++;
-		}
-	}
-}
-
-std::vector<OnScreenDisplay::Entry> OnScreenDisplay::Entries() {
-	std::lock_guard<std::mutex> guard(mutex_);
-	return entries_;  // makes a copy.
-}
-
-std::vector<OnScreenDisplay::ProgressBar> OnScreenDisplay::ProgressBars() {
-	std::lock_guard<std::mutex> guard(mutex_);
-	return bars_;  // makes a copy.
-}
-
-void OnScreenDisplay::Show(OSDType type, const std::string &text, const std::string &text2, const std::string &icon, float duration_s, const char *id) {
-	// Automatic duration based on type.
-	if (duration_s <= 0.0f) {
-		switch (type) {
-		case OSDType::MESSAGE_ERROR:
-		case OSDType::MESSAGE_WARNING:
-			duration_s = 3.0f;
-			break;
-		case OSDType::MESSAGE_FILE_LINK:
-			duration_s = 5.0f;
-			break;
-		case OSDType::MESSAGE_SUCCESS:
-			duration_s = 2.0f;
-			break;
-		default:
-			duration_s = 1.5f;
-			break;
-		}
-	}
-
-	double now = time_now_d();
-	std::lock_guard<std::mutex> guard(mutex_);
-	if (id) {
-		for (auto iter = entries_.begin(); iter != entries_.end(); ++iter) {
-			if (iter->id && !strcmp(iter->id, id)) {
-				Entry msg = *iter;
-				msg.endTime = now + duration_s;
-				msg.text = text;
-				msg.text2 = text2;
-				msg.type = type;
-				msg.iconName = icon;
-				// Move to top (should we? maybe not?)
-				entries_.erase(iter);
-				entries_.insert(entries_.begin(), msg);
-				return;
-			}
-		}
-	}
-
-	Entry msg;
-	msg.text = text;
-	msg.text2 = text2;
-	msg.iconName = icon;
-	msg.startTime = now;
-	msg.endTime = now + duration_s;
-	msg.type = type;
-	msg.id = id;
-	entries_.insert(entries_.begin(), msg);
-}
-
-void OnScreenDisplay::ShowAchievementUnlocked(int achievementID) {
-	double now = time_now_d();
-
-	double duration_s = 5.0;
-
-	Entry msg;
-	msg.numericID = achievementID;
-	msg.type = OSDType::ACHIEVEMENT_UNLOCKED;
-	msg.startTime = now;
-	msg.endTime = now + duration_s;
-	entries_.insert(entries_.begin(), msg);
-}
-
-void OnScreenDisplay::ShowOnOff(const std::string &message, bool on, float duration_s) {
-	// TODO: translate "on" and "off"? Or just get rid of this whole thing?
-	Show(OSDType::MESSAGE_INFO, message + ": " + (on ? "on" : "off"), duration_s);
-}
-
-void OnScreenDisplay::SetProgressBar(std::string id, std::string &&message, int minValue, int maxValue, int progress) {
-	std::lock_guard<std::mutex> guard(mutex_);
-	double now = time_now_d();
-	bool found = false;
-	for (auto &bar : bars_) {
-		if (bar.id == id) {
-			bar.minValue = minValue;
-			bar.maxValue = maxValue;
-			bar.progress = progress;
-			bar.message = message;
-			bar.endTime = now + 60.0;  // Nudge the progress bar to keep it shown.
-			return;
-		}
-	}
-
-	ProgressBar bar;
-	bar.id = id;
-	bar.message = std::move(message);
-	bar.minValue = minValue;
-	bar.maxValue = maxValue;
-	bar.progress = progress;
-	bar.endTime = now + 60.0;  // Show the progress bar for 60 seconds, then fade it out.
-	bars_.push_back(bar);
-}
-
-void OnScreenDisplay::RemoveProgressBar(std::string id, float fadeout_s) {
-	std::lock_guard<std::mutex> guard(mutex_);
-	for (auto iter = bars_.begin(); iter != bars_.end(); iter++) {
-		if (iter->id == id) {
-			iter->progress = iter->maxValue;
-			iter->endTime = time_now_d() + (double)fadeout_s;
-			break;
-		}
-	}
-}
 
 const char *RequestTypeAsString(SystemRequestType type) {
 	switch (type) {

Common/System/System.h

@@ -214,78 +214,6 @@ bool System_AudioRecordingState();
 // This will be changed to take an enum. Currently simply implemented by forwarding to NativeMessageReceived.
 void System_PostUIMessage(const std::string &message, const std::string &param);
 
-// Shows a visible message to the user.
-// The default implementation in NativeApp.cpp uses our "osm" system (on screen messaging).
-enum class OSDType {
-	MESSAGE_INFO,
-	MESSAGE_SUCCESS,
-	MESSAGE_WARNING,
-	MESSAGE_ERROR,
-	MESSAGE_ERROR_DUMP,  // displays lots of text (after the first line), small size
-	MESSAGE_FILE_LINK,
-
-	ACHIEVEMENT_UNLOCKED,
-
-	// PROGRESS_BAR,
-	// PROGRESS_INDETERMINATE,
-};
-
-// Data holder for on-screen messages.
-class OnScreenDisplay {
-public:
-	// If you specify 0.0f as duration, a duration will be chosen automatically depending on type.
-	void Show(OSDType type, const std::string &text, float duration_s = 0.0f, const char *id = nullptr) {
-		Show(type, text, "", duration_s, id);
-	}
-	void Show(OSDType type, const std::string &text, const std::string &text2, float duration_s = 0.0f, const char *id = nullptr) {
-		Show(type, text, text2, "", duration_s, id);
-	}
-	void Show(OSDType type, const std::string &text, const std::string &text2, const std::string &icon, float duration_s = 0.0f, const char *id = nullptr);
-	void ShowAchievementUnlocked(int achievementID);
-
-	void ShowOnOff(const std::string &message, bool on, float duration_s = 0.0f);
-
-	bool IsEmpty() const { return entries_.empty(); }  // Shortcut to skip rendering.
-
-	// Call this every frame, cleans up old entries.
-	void Update();
-
-	// Progress bar controls
-	// Set is both create and update.
-	void SetProgressBar(std::string id, std::string &&message, int minValue, int maxValue, int progress);
-	void RemoveProgressBar(std::string id, float fadeout_s);
-
-	struct Entry {
-		OSDType type;
-		std::string text;
-		std::string text2;
-		std::string iconName;
-		int numericID;
-		const char *id;
-		double startTime;
-		double endTime;
-	};
-
-	struct ProgressBar {
-		std::string id;
-		std::string message;
-		int minValue;
-		int maxValue;
-		int progress;
-		double endTime;
-	};
-
-	std::vector<Entry> Entries();
-	std::vector<ProgressBar> ProgressBars();
-
-private:
-	std::vector<Entry> entries_;
-	std::vector<ProgressBar> bars_;
-	std::mutex mutex_;
-};
-
-extern OnScreenDisplay g_OSD;
-
 // For these functions, most platforms will use the implementation provided in UI/AudioCommon.cpp,
 // no need to implement separately.
 void System_AudioGetDebugStats(char *buf, size_t bufSize);

Core/CwCheat.cpp

@@ -7,7 +7,7 @@
 #include "Common/StringUtils.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/File/FileUtil.h"
 #include "Core/CoreTiming.h"
 #include "Core/CoreParameter.h"

Core/Dialog/SavedataParam.cpp

@@ -22,7 +22,7 @@
 #include "Common/Data/Format/ZIMLoad.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/StringUtils.h"
 #include "Core/Config.h"
 #include "Core/Reporting.h"

Core/FileSystems/BlockDevices.cpp

@@ -21,7 +21,7 @@
 
 #include "Common/Data/Text/I18n.h"
 #include "Common/File/FileUtil.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Log.h"
 #include "Common/Swap.h"
 #include "Core/Loaders.h"

Core/FileSystems/DirectoryFileSystem.cpp

@@ -33,7 +33,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/File/FileUtil.h"
 #include "Common/File/DiskFree.h"
 #include "Common/File/VFS/VFS.h"

Core/HLE/proAdhoc.cpp

@@ -57,7 +57,7 @@
 
 #include "Common/Data/Text/I18n.h"
 #include "Common/Data/Text/Parsers.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Thread/ThreadUtil.h"
 
 #include "Common/Serialize/SerializeFuncs.h"

Core/HLE/proAdhocServer.cpp

@@ -57,7 +57,7 @@ extern "C" struct hostent *gethostbyname(const char *name);
 
 #include "Common/Data/Text/I18n.h"
 #include "Common/Thread/ThreadUtil.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 
 #include "Common/File/FileUtil.h"
 #include "Common/TimeUtil.h"

Core/HLE/sceDisplay.cpp

@@ -30,6 +30,7 @@
 #include "Common/Data/Text/I18n.h"
 #include "Common/Profiler/Profiler.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"

Core/HLE/sceNetAdhoc.cpp

@@ -39,7 +39,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/TimeUtil.h"
 

Core/Util/PortManager.cpp

@@ -35,7 +35,7 @@
 #include "Common/Data/Text/I18n.h"
 #include "Common/Net/Resolve.h"
 #include "Common/Thread/ThreadUtil.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Log.h"
 #include "Core/Config.h"
 #include "Core/System.h"

GPU/Common/FramebufferManagerCommon.cpp

@@ -28,7 +28,7 @@
 #include "Common/Math/lin/matrix4x4.h"
 #include "Common/Math/math_util.h"
 #include "Common/System/Display.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/VR/PPSSPPVR.h"
 #include "Common/CommonTypes.h"
 #include "Common/StringUtils.h"

GPU/Common/PresentationCommon.cpp

@@ -24,6 +24,7 @@
 
 #include "Common/System/Display.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/File/VFS/VFS.h"
 #include "Common/VR/PPSSPPVR.h"
 #include "Common/Log.h"

GPU/Common/TextureReplacer.cpp

@@ -37,7 +37,7 @@
 #include "Common/File/VFS/VFS.h"
 #include "Common/LogReporting.h"
 #include "Common/StringUtils.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Thread/ParallelLoop.h"
 #include "Common/Thread/Waitable.h"
 #include "Common/Thread/ThreadManager.h"

GPU/Directx9/GPU_DX9.cpp

@@ -19,7 +19,7 @@
 
 #include "Common/Serialize/Serializer.h"
 #include "Common/GraphicsContext.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Profiler/Profiler.h"
 #include "Common/Data/Text/I18n.h"
 #include "Core/Debugger/Breakpoints.h"

GPU/Directx9/ShaderManagerDX9.cpp

@@ -29,7 +29,7 @@
 #include "Common/Math/math_util.h"
 #include "Common/GPU/D3D9/D3D9ShaderCompiler.h"
 #include "Common/GPU/thin3d.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/System/Display.h"
 
 #include "Common/CommonTypes.h"

GPU/GLES/GPU_GLES.cpp

@@ -22,7 +22,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/File/FileUtil.h"
 #include "Common/GraphicsContext.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/VR/PPSSPPVR.h"
 
 #include "Core/Config.h"

GPU/GLES/ShaderManagerGLES.cpp

@@ -35,7 +35,7 @@
 #include "Common/GPU/thin3d.h"
 #include "Common/GPU/OpenGL/GLRenderManager.h"
 #include "Common/System/Display.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/VR/PPSSPPVR.h"
 
 #include "Common/Log.h"

GPU/GLES/TextureCacheGLES.cpp

@@ -24,7 +24,7 @@
 #include "Common/Data/Text/I18n.h"
 #include "Common/Math/math_util.h"
 #include "Common/Profiler/Profiler.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/GPU/OpenGL/GLRenderManager.h"
 #include "Common/TimeUtil.h"
 

GPU/Vulkan/TextureCacheVulkan.cpp

@@ -27,7 +27,7 @@
 #include "Common/Profiler/Profiler.h"
 #include "Common/GPU/thin3d.h"
 #include "Common/GPU/Vulkan/VulkanRenderManager.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/Data/Convert/ColorConv.h"
 #include "Common/StringUtils.h"
 #include "Common/TimeUtil.h"

UI/DevScreens.cpp

@@ -31,6 +31,7 @@
 #include "Common/System/Display.h"
 #include "Common/System/NativeApp.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/GPU/OpenGL/GLFeatures.h"
 
 #if !PPSSPP_PLATFORM(UWP)

UI/EmuScreen.cpp

@@ -42,6 +42,7 @@ using namespace std::placeholders;
 #include "Common/System/System.h"
 #include "Common/System/NativeApp.h"
 #include "Common/System/Request.h"
+#include "Common/System/OSD.h"
 #include "Common/Profiler/Profiler.h"
 #include "Common/Math/curves.h"
 #include "Common/TimeUtil.h"

UI/NativeApp.cpp

@@ -61,6 +61,7 @@
 #include "Common/System/Display.h"
 #include "Common/System/Request.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/System/NativeApp.h"
 
 #include "Common/Data/Text/I18n.h"

UI/OnScreenDisplay.cpp

@@ -12,7 +12,7 @@
 #include "UI/RetroAchievementScreens.h"
 
 #include "Common/UI/Context.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 
 #include "Common/TimeUtil.h"
 #include "Common/Net/HTTPClient.h"

UI/PauseScreen.cpp

@@ -27,7 +27,7 @@
 
 #include "Common/Data/Text/I18n.h"
 #include "Common/StringUtils.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/System/Request.h"
 #include "Common/VR/PPSSPPVR.h"
 #include "Common/UI/AsyncImageFileView.h"

UI/RetroAchievementScreens.cpp

@@ -1,5 +1,6 @@
 #include "UI/RetroAchievementScreens.h"
 #include "UI/RetroAchievements.h"
+#include "Common/System/OSD.h"
 #include "Common/System/Request.h"
 #include "Common/UI/View.h"
 #include "Common/UI/ViewGroup.h"

UI/RetroAchievements.cpp

@@ -31,12 +31,13 @@
 #include "Common/File/Path.h"
 #include "Common/File/FileUtil.h"
 #include "Common/Net/HTTPClient.h"
+#include "Common/System/OSD.h"
+#include "Common/System/System.h"
 #include "Common/System/NativeApp.h"
 #include "Common/TimeUtil.h"
 #include "Common/Data/Text/I18n.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/StringUtils.h"
-#include "Common/System/System.h"
 #include "Common/Crypto/md5.h"
 #include "Common/UI/IconCache.h"
 

UWP/CommonUWP/CommonUWP.vcxproj

@@ -68,7 +68,7 @@
   <PropertyGroup>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
-  <ItemDefinitionGroup  Condition="'$(Platform)' == 'Win32' or '$(Platform)' == 'x64'" Label="Configuration">
+  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' or '$(Platform)' == 'x64'" Label="Configuration">
     <ClCompile>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
@@ -214,6 +214,7 @@
     <ClInclude Include="..\..\Common\SysError.h" />
     <ClInclude Include="..\..\Common\System\Display.h" />
     <ClInclude Include="..\..\Common\System\NativeApp.h" />
+    <ClInclude Include="..\..\Common\System\OSD.h" />
     <ClInclude Include="..\..\Common\System\Request.h" />
     <ClInclude Include="..\..\Common\System\System.h" />
     <ClInclude Include="..\..\Common\Thread\Channel.h" />
@@ -352,6 +353,7 @@
     <ClCompile Include="..\..\Common\OSVersion.cpp" />
     <ClCompile Include="..\..\Common\StringUtils.cpp" />
     <ClCompile Include="..\..\Common\System\Display.cpp" />
+    <ClCompile Include="..\..\Common\System\OSD.cpp" />
     <ClCompile Include="..\..\Common\System\Request.cpp" />
     <ClCompile Include="..\..\Common\Thread\ThreadUtil.cpp" />
     <ClCompile Include="..\..\Common\Thread\ThreadManager.cpp" />

UWP/CommonUWP/CommonUWP.vcxproj.filters

@@ -441,6 +441,9 @@
     <ClCompile Include="..\..\Common\UI\IconCache.cpp">
       <Filter>UI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Common\System\OSD.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="targetver.h" />
@@ -835,6 +838,9 @@
     <ClInclude Include="..\..\Common\UI\IconCache.h">
       <Filter>UI</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Common\System\OSD.h">
+      <Filter>System</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Common\Math\fast\fast_matrix_neon.S">

Windows/GPU/WindowsGLContext.cpp

@@ -22,7 +22,7 @@
 #include "Common/GPU/OpenGL/GLFeatures.h"
 #include "Common/GPU/thin3d_create.h"
 #include "Common/GPU/OpenGL/GLRenderManager.h"
-#include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "GL/gl.h"
 #include "GL/wglew.h"
 #include "Core/Config.h"

Windows/MainWindowMenu.cpp

@@ -14,6 +14,7 @@
 #include "Common/Data/Text/I18n.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/System/NativeApp.h"
 #include "Common/System/Request.h"
 #include "Common/File/FileUtil.h"

android/jni/Android.mk

@@ -247,6 +247,7 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/Profiler/Profiler.cpp \
   $(SRC)/Common/System/Display.cpp \
   $(SRC)/Common/System/Request.cpp \
+  $(SRC)/Common/System/OSD.cpp \
   $(SRC)/Common/Thread/ThreadUtil.cpp \
   $(SRC)/Common/Thread/ThreadManager.cpp \
   $(SRC)/Common/Thread/ParallelLoop.cpp \

android/jni/app-android.cpp

@@ -61,6 +61,7 @@ struct JNIEnv {};
 #include "Common/System/Display.h"
 #include "Common/System/NativeApp.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/System/Request.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/File/Path.h"

ios/ViewController.mm

@@ -22,6 +22,7 @@
 
 #include "Common/System/Display.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/System/NativeApp.h"
 #include "Common/File/VFS/VFS.h"
 #include "Common/Log.h"

libretro/Makefile.common

@@ -347,6 +347,7 @@ SOURCES_CXX += \
 	$(COMMONDIR)/UI/PopupScreens.cpp \
 	$(COMMONDIR)/System/Display.cpp \
 	$(COMMONDIR)/System/Request.cpp \
+	$(COMMONDIR)/System/OSD.cpp \
 	$(COMMONDIR)/ArmCPUDetect.cpp \
 	$(COMMONDIR)/CPUDetect.cpp \
 	$(COMMONDIR)/Buffer.cpp \