Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5330] trunk/OpenMPT
|
From: <man...@us...> - 2015-06-17 13:56:16
|
Revision: 5330
http://sourceforge.net/p/modplug/code/5330
Author: manxorist
Date: 2015-06-17 13:56:08 +0000 (Wed, 17 Jun 2015)
Log Message:
-----------
[Ref] ComponentManager: Allow querying the state of the managed components.
[Imp] About Dialog: Show the state of all components.
Modified Paths:
--------------
trunk/OpenMPT/common/ComponentManager.cpp
trunk/OpenMPT/common/ComponentManager.h
trunk/OpenMPT/mptrack/AboutDialog.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp
trunk/OpenMPT/pluginBridge/BridgeWrapper.h
trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
trunk/OpenMPT/sounddev/SoundDeviceASIO.h
trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp
trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h
trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
trunk/OpenMPT/sounddev/SoundDevicePortAudio.h
trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
trunk/OpenMPT/sounddev/SoundDeviceWaveout.h
trunk/OpenMPT/soundlib/Load_mo3.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
Modified: trunk/OpenMPT/common/ComponentManager.cpp
===================================================================
--- trunk/OpenMPT/common/ComponentManager.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/common/ComponentManager.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -170,9 +170,10 @@
#if MPT_COMPONENT_MANAGER
-ComponentFactoryBase::ComponentFactoryBase(const std::string &id)
-//---------------------------------------------------------------
+ComponentFactoryBase::ComponentFactoryBase(const std::string &id, const std::string &settingsKey)
+//-----------------------------------------------------------------------------------------------
: m_ID(id)
+ , m_SettingsKey(settingsKey)
{
return;
}
@@ -192,9 +193,20 @@
}
-void ComponentFactoryBase::Initialize(ComponentManager &componentManager, MPT_SHARED_PTR<IComponent> component)
-//-------------------------------------------------------------------------------------------------------------
+std::string ComponentFactoryBase::GetSettingsKey() const
+//------------------------------------------------------
{
+ return m_SettingsKey;
+}
+
+
+void ComponentFactoryBase::Initialize(ComponentManager &componentManager, MPT_SHARED_PTR<IComponent> component) const
+//-------------------------------------------------------------------------------------------------------------------
+{
+ if(componentManager.IsComponentBlocked(GetSettingsKey()))
+ {
+ return;
+ }
componentManager.InitializeComponent(component);
}
@@ -280,6 +292,7 @@
return;
}
RegisteredComponent registeredComponent;
+ registeredComponent.settingsKey = componentFactory.GetSettingsKey();
registeredComponent.factoryMethod = componentFactory.GetStaticConstructor();
registeredComponent.instance = MPT_SHARED_PTR<IComponent>();
m_Components.insert(std::make_pair(componentFactory.GetID(), registeredComponent));
@@ -306,6 +319,13 @@
}
+bool ComponentManager::IsComponentBlocked(const std::string &settingsKey) const
+//-----------------------------------------------------------------------------
+{
+ return m_Settings.IsBlocked(settingsKey);
+}
+
+
void ComponentManager::InitializeComponent(MPT_SHARED_PTR<IComponent> component) const
//------------------------------------------------------------------------------------
{
@@ -317,10 +337,6 @@
{
return;
}
- if(m_Settings.IsBlocked(component->GetSettingsKey()))
- {
- return;
- }
component->Initialize();
}
@@ -352,6 +368,58 @@
}
+std::vector<std::string> ComponentManager::GetRegisteredComponents() const
+{
+ std::vector<std::string> result;
+ for(TComponentMap::const_iterator it = m_Components.begin(); it != m_Components.end(); ++it)
+ {
+ result.push_back((*it).first);
+ }
+ return result;
+}
+
+
+ComponentInfo ComponentManager::GetComponentInfo(std::string name) const
+{
+ ComponentInfo result;
+ result.name = name;
+ result.state = ComponentStateUnregistered;
+ result.settingsKey = "";
+ result.type = ComponentTypeUnknown;
+ TComponentMap::const_iterator it = m_Components.find(name);
+ if(it == m_Components.end())
+ {
+ result.state = ComponentStateUnregistered;
+ return result;
+ }
+ result.settingsKey = it->second.settingsKey;
+ if(IsComponentBlocked(it->second.settingsKey))
+ {
+ result.state = ComponentStateBlocked;
+ return result;
+ }
+ MPT_SHARED_PTR<IComponent> component = ((*it).second.instance) ? it->second.instance : MPT_SHARED_PTR<IComponent>();
+ if(!component)
+ {
+ result.state = ComponentStateUnintialized;
+ return result;
+ }
+ result.type = component->GetType();
+ if(!component->IsInitialized())
+ {
+ result.state = ComponentStateUnintialized;
+ return result;
+ }
+ if(!component->IsAvailable())
+ {
+ result.state = ComponentStateUnavailable;
+ return result;
+ }
+ result.state = ComponentStateAvailable;
+ return result;
+}
+
+
#endif // MPT_COMPONENT_MANAGER
Modified: trunk/OpenMPT/common/ComponentManager.h
===================================================================
--- trunk/OpenMPT/common/ComponentManager.h 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/common/ComponentManager.h 2015-06-17 13:56:08 UTC (rev 5330)
@@ -30,6 +30,7 @@
enum ComponentType
{
+ ComponentTypeUnknown = 0,
ComponentTypeBuiltin, // PortAudio
ComponentTypeSystem, // uxtheme.dll, mf.dll
ComponentTypeSystemInstallable, // acm mp3 codec
@@ -56,7 +57,6 @@
public:
- virtual std::string GetSettingsKey() const = 0;
virtual ComponentType GetType() const = 0;
virtual bool IsInitialized() const = 0; // Initialize() has been called
@@ -230,6 +230,7 @@
virtual ~IComponentFactory() { }
public:
virtual std::string GetID() const = 0;
+ virtual std::string GetSettingsKey() const = 0;
virtual MPT_SHARED_PTR<IComponent> Construct(ComponentManager &componentManager) const = 0;
virtual ComponentFactoryMethod GetStaticConstructor() const = 0;
};
@@ -240,12 +241,14 @@
{
private:
std::string m_ID;
+ std::string m_SettingsKey;
protected:
- ComponentFactoryBase(const std::string &id);
- static void Initialize(ComponentManager &componentManager, MPT_SHARED_PTR<IComponent> component);
+ ComponentFactoryBase(const std::string &id, const std::string &settingsKey);
+ void Initialize(ComponentManager &componentManager, MPT_SHARED_PTR<IComponent> component) const;
public:
virtual ~ComponentFactoryBase();
virtual std::string GetID() const;
+ virtual std::string GetSettingsKey() const;
virtual MPT_SHARED_PTR<IComponent> Construct(ComponentManager &componentManager) const = 0;
virtual ComponentFactoryMethod GetStaticConstructor() const = 0;
};
@@ -256,8 +259,8 @@
: public ComponentFactoryBase
{
public:
- ComponentFactory(const std::string &id)
- : ComponentFactoryBase(id)
+ ComponentFactory()
+ : ComponentFactoryBase(T::g_ID, T::g_SettingsKey)
{
return;
}
@@ -268,14 +271,14 @@
public:
virtual MPT_SHARED_PTR<IComponent> Construct(ComponentManager &componentManager) const
{
- return StaticConstruct(componentManager);
- }
- static MPT_SHARED_PTR<IComponent> StaticConstruct(ComponentManager &componentManager)
- {
MPT_SHARED_PTR<IComponent> component = mpt::make_shared<T>();
Initialize(componentManager, component);
return component;
}
+ static MPT_SHARED_PTR<IComponent> StaticConstruct(ComponentManager &componentManager)
+ {
+ return ComponentFactory().Construct(componentManager);
+ }
virtual ComponentFactoryMethod GetStaticConstructor() const
{
return &StaticConstruct;
@@ -302,6 +305,25 @@
};
+enum ComponentState
+{
+ ComponentStateUnregistered,
+ ComponentStateBlocked,
+ ComponentStateUnintialized,
+ ComponentStateUnavailable,
+ ComponentStateAvailable,
+};
+
+
+struct ComponentInfo
+{
+ std::string name;
+ ComponentState state;
+ std::string settingsKey;
+ ComponentType type;
+};
+
+
class ComponentManager
{
friend class ComponentFactoryBase;
@@ -314,6 +336,7 @@
private:
struct RegisteredComponent
{
+ std::string settingsKey;
ComponentFactoryMethod factoryMethod;
MPT_SHARED_PTR<IComponent> instance;
};
@@ -321,11 +344,14 @@
const IComponentManagerSettings &m_Settings;
TComponentMap m_Components;
private:
+ bool IsComponentBlocked(const std::string &settingsKey) const;
void InitializeComponent(MPT_SHARED_PTR<IComponent> component) const;
public:
void Register(const IComponentFactory &componentFactory);
void Startup();
MPT_SHARED_PTR<IComponent> GetComponent(const IComponentFactory &componentFactory);
+ std::vector<std::string> GetRegisteredComponents() const;
+ ComponentInfo GetComponentInfo(std::string name) const;
};
@@ -337,23 +363,24 @@
bool ComponentListPush(ComponentListEntry *entry);
-#define MPT_DECLARE_COMPONENT_MEMBERS public: static const char * const g_ID;
+#define MPT_DECLARE_COMPONENT_MEMBERS public: static const char * const g_ID; static const char * const g_SettingsKey;
-#define MPT_REGISTERED_COMPONENT(name) \
+#define MPT_REGISTERED_COMPONENT(name, settingsKey) \
static void RegisterComponent ## name (ComponentManager &componentManager) \
{ \
- componentManager.Register(ComponentFactory< name >( #name )); \
+ componentManager.Register(ComponentFactory< name >()); \
} \
static ComponentListEntry Component ## name ## ListEntry = { nullptr, & RegisterComponent ## name }; \
static bool Component ## name ## Registered = ComponentListPush(& Component ## name ## ListEntry ); \
const char * const name :: g_ID = #name ; \
+ const char * const name :: g_SettingsKey = settingsKey ; \
/**/
template <typename type>
MPT_SHARED_PTR<type> GetComponent()
{
- return MPT_DYNAMIC_POINTER_CAST<type>(ComponentManager::Instance()->GetComponent(ComponentFactory<type>(type::g_ID)));
+ return MPT_DYNAMIC_POINTER_CAST<type>(ComponentManager::Instance()->GetComponent(ComponentFactory<type>()));
}
@@ -362,7 +389,7 @@
#define MPT_DECLARE_COMPONENT_MEMBERS
-#define MPT_REGISTERED_COMPONENT(name)
+#define MPT_REGISTERED_COMPONENT(name, settingsKey)
template <typename type>
Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/mptrack/AboutDialog.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -280,9 +280,10 @@
m_Tab.SubclassDlgItem(IDC_TABABOUT, this);
m_Tab.InsertItem(TCIF_TEXT, 0, _T("OpenMPT"), 0, 0, 0, 0);
- m_Tab.InsertItem(TCIF_TEXT, 1, _T("Credits"), 0, 0, 0, 0);
- m_Tab.InsertItem(TCIF_TEXT, 2, _T("License"), 0, 0, 0, 0);
- m_Tab.InsertItem(TCIF_TEXT, 3, _T("Contact"), 0, 0, 0, 0);
+ m_Tab.InsertItem(TCIF_TEXT, 1, _T("Components"), 0, 0, 0, 0);
+ m_Tab.InsertItem(TCIF_TEXT, 2, _T("Credits"), 0, 0, 0, 0);
+ m_Tab.InsertItem(TCIF_TEXT, 3, _T("License"), 0, 0, 0, 0);
+ m_Tab.InsertItem(TCIF_TEXT, 4, _T("Contact"), 0, 0, 0, 0);
m_Tab.SetCurSel(0);
m_CheckScroll.SetCheck(TrackerSettings::Instance().MiscAboutScrollText ? BST_CHECKED : BST_UNCHECKED);
@@ -293,12 +294,12 @@
mpt::ustring text;
text += GetTabText(0);
text += MPT_USTRING("\n\n\n");
- text += GetTabText(1);
+ text += GetTabText(2);
text += MPT_USTRING("\n\n\n");
+ text += GetTabText(4);
+ text += MPT_USTRING("\n\n\n");
text += GetTabText(3);
text += MPT_USTRING("\n\n\n");
- text += GetTabText(2);
- text += MPT_USTRING("\n\n\n");
m_static.SetCredits(mpt::ToCString(mpt::String::Replace(text, MPT_USTRING("\n"), MPT_USTRING("|"))));
m_static.StartScrolling();
@@ -411,12 +412,78 @@
text += MPT_UFORMAT("Settings%2: %1", theApp.GetConfigFileName(), theApp.IsPortableMode() ? MPT_USTRING(" (portable)") : MPT_USTRING("")) + lf;
break;
case 1:
+ {
+ if(!TrackerSettings::Instance().ComponentsKeepLoaded)
+ {
+ text += MPT_USTRING("Components are loaded and unloaded as needed.") + lf;
+ text += lf;
+ std::vector<std::string> components = ComponentManager::Instance()->GetRegisteredComponents();
+ for(std::size_t i = 0; i < components.size(); ++i)
+ {
+ ComponentInfo info = ComponentManager::Instance()->GetComponentInfo(components[i]);
+ mpt::ustring name = mpt::ToUnicode(mpt::CharsetASCII, (info.name.substr(0, 9) == "Component") ? info.name.substr(9) : info.name);
+ if(!info.settingsKey.empty())
+ {
+ name = mpt::ToUnicode(mpt::CharsetASCII, info.settingsKey);
+ }
+ text += name + lf;
+ }
+ } else
+ {
+ std::vector<std::string> components = ComponentManager::Instance()->GetRegisteredComponents();
+ for(int available = 1; available >= 0; --available)
+ {
+ if(available)
+ {
+ text += MPT_USTRING("Loaded Components:") + lf;
+ } else
+ {
+ text += lf;
+ text += MPT_USTRING("Unloaded Components:") + lf;
+ }
+ for(std::size_t i = 0; i < components.size(); ++i)
+ {
+ ComponentInfo info = ComponentManager::Instance()->GetComponentInfo(components[i]);
+ if(available && info.state != ComponentStateAvailable) continue;
+ if(!available && info.state == ComponentStateAvailable) continue;
+ mpt::ustring name = mpt::ToUnicode(mpt::CharsetASCII, (info.name.substr(0, 9) == "Component") ? info.name.substr(9) : info.name);
+ if(!info.settingsKey.empty())
+ {
+ name = mpt::ToUnicode(mpt::CharsetASCII, info.settingsKey);
+ }
+ text += MPT_UFORMAT("%1: %2"
+ , name
+ , info.state == ComponentStateAvailable ? MPT_USTRING("ok") :
+ info.state == ComponentStateUnavailable? MPT_USTRING("missing") :
+ info.state == ComponentStateUnintialized ? MPT_USTRING("not loaded") :
+ info.state == ComponentStateBlocked ? MPT_USTRING("blocked") :
+ info.state == ComponentStateUnregistered ? MPT_USTRING("unregistered") :
+ MPT_USTRING("unknown")
+ );
+ if(info.type != ComponentTypeUnknown)
+ {
+ text += MPT_UFORMAT(" (%1)"
+ , info.type == ComponentTypeBuiltin ? MPT_USTRING("builtin") :
+ info.type == ComponentTypeSystem ? MPT_USTRING("system") :
+ info.type == ComponentTypeSystemInstallable ? MPT_USTRING("system, optional") :
+ info.type == ComponentTypeBundled ? MPT_USTRING("bundled") :
+ info.type == ComponentTypeForeign ? MPT_USTRING("foreign") :
+ MPT_USTRING("unknown")
+ );
+ }
+ text += lf;
+ }
+ }
+ }
+ }
+ break;
+ case 2:
text += mpt::ToUnicode(mpt::CharsetUTF8, MptVersion::GetFullCreditsString());
break;
- case 2:
+ case 3:
text += mpt::ToUnicode(mpt::CharsetUTF8, MptVersion::GetLicenseString());
break;
- case 3:
+ case 4:
text += mpt::ToUnicode(mpt::CharsetUTF8, MptVersion::GetContactString());
break;
}
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -1823,9 +1823,8 @@
{
return;
}
- std::string GetSettingsKey() const { return "SoundTouch"; }
};
-MPT_REGISTERED_COMPONENT(ComponentSoundTouch)
+MPT_REGISTERED_COMPONENT(ComponentSoundTouch, "SoundTouch")
int CCtrlSamples::TimeStretch(float ratio)
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -750,7 +750,7 @@
};
-MPT_REGISTERED_COMPONENT(ComponentUXTheme)
+MPT_REGISTERED_COMPONENT(ComponentUXTheme, "UXTheme")
// Move a config file called sFileName from the App's directory (or one of its sub directories specified by sSubDir) to
Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/mptrack/Mptrack.h 2015-06-17 13:56:08 UTC (rev 5330)
@@ -152,7 +152,6 @@
MPT_DECLARE_COMPONENT_MEMBERS
public:
ComponentUXTheme() : ComponentSystemDLL(MPT_PATHSTRING("uxtheme")) { }
- std::string GetSettingsKey() const { return "UXTheme"; }
};
//=============================
Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -334,8 +334,6 @@
return;
}
- std::string GetSettingsKey() const { return "LibMP3Lame"; }
-
protected:
bool DoInitialize()
@@ -470,7 +468,7 @@
return traits;
}
};
-MPT_REGISTERED_COMPONENT(ComponentLame)
+MPT_REGISTERED_COMPONENT(ComponentLame, "LibMP3Lame")
class MP3LameStreamWriter : public StreamWriterBase
{
@@ -679,8 +677,6 @@
return;
}
- std::string GetSettingsKey() const { return "BladeEnc"; }
-
protected:
bool DoInitialize()
@@ -767,7 +763,7 @@
return traits;
}
};
-MPT_REGISTERED_COMPONENT(ComponentBlade)
+MPT_REGISTERED_COMPONENT(ComponentBlade, "BladeEnc")
class MP3BladeStreamWriter : public StreamWriterBase
{
@@ -951,8 +947,6 @@
return;
}
- std::string GetSettingsKey() const { return "ACM_MP3"; }
-
protected:
bool DoInitialize()
@@ -1219,7 +1213,7 @@
return traits;
}
};
-MPT_REGISTERED_COMPONENT(ComponentAcmMP3)
+MPT_REGISTERED_COMPONENT(ComponentAcmMP3, "ACM_MP3")
class MP3AcmStreamWriter : public StreamWriterBase
{
Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -70,8 +70,6 @@
return;
}
- std::string GetSettingsKey() const { return "Opus"; }
-
protected:
bool DoInitialize()
@@ -157,7 +155,7 @@
}
};
-MPT_REGISTERED_COMPONENT(ComponentOpus)
+MPT_REGISTERED_COMPONENT(ComponentOpus, "Opus")
Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -74,8 +74,6 @@
return;
}
- std::string GetSettingsKey() const { return "Vorbis"; }
-
protected:
bool DoInitialize()
@@ -181,7 +179,7 @@
return traits;
}
};
-MPT_REGISTERED_COMPONENT(ComponentVorbis)
+MPT_REGISTERED_COMPONENT(ComponentVorbis, "Vorbis")
#ifndef NO_OGG
Modified: trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp
===================================================================
--- trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -69,9 +69,9 @@
}
-MPT_REGISTERED_COMPONENT(ComponentPluginBridge32)
+MPT_REGISTERED_COMPONENT(ComponentPluginBridge32, "PluginBridge32")
-MPT_REGISTERED_COMPONENT(ComponentPluginBridge64)
+MPT_REGISTERED_COMPONENT(ComponentPluginBridge64, "PluginBridge64")
// Check whether we need to load a 32-bit or 64-bit wrapper.
Modified: trunk/OpenMPT/pluginBridge/BridgeWrapper.h
===================================================================
--- trunk/OpenMPT/pluginBridge/BridgeWrapper.h 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/pluginBridge/BridgeWrapper.h 2015-06-17 13:56:08 UTC (rev 5330)
@@ -47,7 +47,6 @@
MPT_DECLARE_COMPONENT_MEMBERS
public:
ComponentPluginBridge32() : ComponentPluginBridge(32) { }
- std::string GetSettingsKey() const { return "PluginBridge32"; }
};
class ComponentPluginBridge64
@@ -56,7 +55,6 @@
MPT_DECLARE_COMPONENT_MEMBERS
public:
ComponentPluginBridge64() : ComponentPluginBridge(64) { }
- std::string GetSettingsKey() const { return "PluginBridge64"; }
};
class BridgeWrapper : protected BridgeCommon
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -31,7 +31,7 @@
#ifndef NO_ASIO
-MPT_REGISTERED_COMPONENT(ComponentASIO)
+MPT_REGISTERED_COMPONENT(ComponentASIO, "ASIO")
static const double AsioSampleRateTolerance = 0.05;
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-06-17 13:56:08 UTC (rev 5330)
@@ -33,7 +33,6 @@
public:
ComponentASIO() { }
virtual ~ComponentASIO() { }
- std::string GetSettingsKey() const { return "ASIO"; }
virtual bool DoInitialize() { return true; }
};
Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -29,7 +29,7 @@
#ifndef NO_DSOUND
-MPT_REGISTERED_COMPONENT(ComponentDirectSound)
+MPT_REGISTERED_COMPONENT(ComponentDirectSound, "DirectSound")
Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h 2015-06-17 13:56:08 UTC (rev 5330)
@@ -32,7 +32,6 @@
public:
ComponentDirectSound() { }
virtual ~ComponentDirectSound() { }
- std::string GetSettingsKey() const { return "DirectSound"; }
virtual bool DoInitialize() { return true; }
};
Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -582,7 +582,7 @@
#endif // MPT_COMPILER_MSVC
-MPT_REGISTERED_COMPONENT(ComponentPortAudio)
+MPT_REGISTERED_COMPONENT(ComponentPortAudio, "PortAudio")
ComponentPortAudio::ComponentPortAudio()
Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-06-17 13:56:08 UTC (rev 5330)
@@ -109,7 +109,6 @@
public:
ComponentPortAudio();
virtual ~ComponentPortAudio();
- std::string GetSettingsKey() const { return "PortAudio"; }
virtual bool DoInitialize();
bool ReInit();
};
Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -27,7 +27,7 @@
#if MPT_OS_WINDOWS
-MPT_REGISTERED_COMPONENT(ComponentWaveOut)
+MPT_REGISTERED_COMPONENT(ComponentWaveOut, "WaveOut")
static const std::size_t WAVEOUT_MINBUFFERS = 3;
Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceWaveout.h 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.h 2015-06-17 13:56:08 UTC (rev 5330)
@@ -35,7 +35,6 @@
public:
ComponentWaveOut() { }
virtual ~ComponentWaveOut() { }
- std::string GetSettingsKey() const { return "WaveOut"; }
virtual bool DoInitialize() { return true; }
};
Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mo3.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/soundlib/Load_mo3.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -53,7 +53,6 @@
}
public:
ComponentUnMO3() : ComponentLibrary(ComponentTypeForeign) { }
- std::string GetSettingsKey() const { return "UnMO3"; }
bool DoInitialize()
{
#ifdef MPT_LINKED_UNMO3
@@ -79,7 +78,7 @@
#endif
}
};
-MPT_REGISTERED_COMPONENT(ComponentUnMO3)
+MPT_REGISTERED_COMPONENT(ComponentUnMO3, "UnMO3")
#endif // !NO_MO3
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-06-17 09:58:25 UTC (rev 5329)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-06-17 13:56:08 UTC (rev 5330)
@@ -2497,7 +2497,6 @@
};
public:
ComponentMPG123() : ComponentLibrary(ComponentTypeForeign) { }
- std::string GetSettingsKey() const { return "Mpg123"; }
bool DoInitialize()
{
AddLibrary("mpg123", mpt::LibraryPath::AppFullName(MPT_PATHSTRING("libmpg123-0")));
@@ -2524,7 +2523,7 @@
return true;
}
};
-MPT_REGISTERED_COMPONENT(ComponentMPG123)
+MPT_REGISTERED_COMPONENT(ComponentMPG123, "Mpg123")
#endif // NO_MP3_SAMPLES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
