Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1459 Reserve functional group controller node names

Browse source
This commit is contained in:
kaetemi 2012-04-13 13:59:24 +02:00
parent 2be1238ec5
commit d3ea70098b
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/include/nel/sound/group_controller_root.h
View file

@ -59,6 +59,7 @@ protected:
virtual void calculateFinalGain(); virtual void calculateFinalGain();
virtual void increaseSources(); virtual void increaseSources();
virtual void decreaseSources(); virtual void decreaseSources();
static bool isReservedName(const std::string &nodeName);
}; /* class CGroupControllerRoot */ }; /* class CGroupControllerRoot */

16
code/nel/src/sound/group_controller_root.cpp
View file

@ -78,6 +78,18 @@ void CGroupControllerRoot::decreaseSources()
--m_NbSourcesInclChild; --m_NbSourcesInclChild;
} }
bool CGroupControllerRoot::isReservedName(const std::string &nodeName)
{
// These node names are reserved, in case these category controllers can be integrated with CDB.
// I do not forsee any functionality for changing environment effect settings for entire categories.
// The nodeName parameter is already lowercase, see CGroupControllerRoot::getGroupController.
if (nodeName == NLSOUND_GROUP_CONTROLLER_ROOT_PATH) return true; // Root node name can only used by root.
if (nodeName == "gain") return true;
if (nodeName == "pitch") return true;
if (nodeName == "enable" || nodeName == "enabled") return true;
return true;
}
CGroupController *CGroupControllerRoot::getGroupController(const std::string &path) CGroupController *CGroupControllerRoot::getGroupController(const std::string &path)
{ {
std::vector<std::string> pathNodes; std::vector<std::string> pathNodes;
@ -91,6 +103,10 @@ CGroupController *CGroupControllerRoot::getGroupController(const std::string &pa
{ {
if (!(*it).empty()) if (!(*it).empty())
{ {
if (isReservedName(*it))
{
nlerror("Attempt to use reserved node name '%s' in group controller path '%s'", (*it).c_str(), path.c_str());
}
std::map<std::string, CGroupController *>::iterator found = active->m_Children.find(*it); std::map<std::string, CGroupController *>::iterator found = active->m_Children.find(*it);
if (found == active->m_Children.end()) if (found == active->m_Children.end())
{ {