[OMPT-svn-commit] OpenMPT r21008 - in trunk/OpenMPT: common mptrack

[<sv...@op...>]

Author: manx
Date: Sun Jun  9 13:03:50 2024
New Revision: 21008
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21008

Log:
[Ref] Component Manager: Remove support for optional Components shipped in the Components folder.

Modified:
   trunk/OpenMPT/common/ComponentManager.cpp
   trunk/OpenMPT/common/ComponentManager.h
   trunk/OpenMPT/mptrack/Mptrack.cpp

Modified: trunk/OpenMPT/common/ComponentManager.cpp
==============================================================================
--- trunk/OpenMPT/common/ComponentManager.cpp	Sun Jun  9 12:48:09 2024	(r21007)
+++ trunk/OpenMPT/common/ComponentManager.cpp	Sun Jun  9 13:03:50 2024	(r21008)
@@ -463,12 +463,6 @@
 }
 
 
-mpt::PathString ComponentManager::GetComponentPath() const
-{
-	return m_Settings.Path();
-}
-
-
 #endif // MPT_COMPONENT_MANAGER
 
 

Modified: trunk/OpenMPT/common/ComponentManager.h
==============================================================================
--- trunk/OpenMPT/common/ComponentManager.h	Sun Jun  9 12:48:09 2024	(r21007)
+++ trunk/OpenMPT/common/ComponentManager.h	Sun Jun  9 13:03:50 2024	(r21008)
@@ -308,7 +308,6 @@
 	virtual bool LoadOnStartup() const = 0;
 	virtual bool KeepLoaded() const = 0;
 	virtual bool IsBlocked(const std::string &key) const = 0;
-	virtual mpt::PathString Path() const = 0;
 protected:
 	virtual ~IComponentManagerSettings() = default;
 };
@@ -321,7 +320,6 @@
 	bool LoadOnStartup() const override { return false; }
 	bool KeepLoaded() const override { return true; }
 	bool IsBlocked(const std::string & /*key*/ ) const override { return false; }
-	mpt::PathString Path() const override { return mpt::PathString(); }
 };
 
 
@@ -374,7 +372,6 @@
 	std::shared_ptr<const IComponent> ReloadComponent(const IComponentFactory &componentFactory);
 	std::vector<std::string> GetRegisteredComponents() const;
 	ComponentInfo GetComponentInfo(std::string name) const;
-	mpt::PathString GetComponentPath() const;
 };
 
 
@@ -423,12 +420,6 @@
 }
 
 
-inline mpt::PathString GetComponentPath()
-{
-	return ComponentManager::Instance()->GetComponentPath();
-}
-
-
 #else // !MPT_COMPONENT_MANAGER
 
 

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	Sun Jun  9 12:48:09 2024	(r21007)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	Sun Jun  9 13:03:50 2024	(r21008)
@@ -849,14 +849,6 @@
 	{
 		return conf.IsComponentBlocked(key);
 	}
-	mpt::PathString Path() const override
-	{
-		if(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture()).empty())
-		{
-			return mpt::PathString();
-		}
-		return configPath + P_("Components\\") + mpt::PathString::FromUnicode(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture())) + P_("\\");
-	}
 };
 
 
@@ -1011,17 +1003,8 @@
 			CreateDirectory(m_ConfigPath.AsNative().c_str(), 0);
 		}
 	}
-	if(!mpt::native_fs{}.is_directory(GetConfigPath() + P_("Components")))
-	{
-		CreateDirectory((GetConfigPath() + P_("Components")).AsNative().c_str(), 0);
-	}
-	if(!mpt::native_fs{}.is_directory(GetConfigPath() + P_("Components\\") + mpt::PathString::FromUnicode(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture()))))
-	{
-		CreateDirectory((GetConfigPath() + P_("Components\\") + mpt::PathString::FromUnicode(mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture()))).AsNative().c_str(), 0);
-	}
 
 	// Handle updates from old versions.
-
 	if(!IsPortableMode())
 	{
 		// Move the config files if they're still in the old place.