Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-25 13:20:10 +01:00
13 changed files with 38 additions and 19 deletions

View File

@@ -343,11 +343,11 @@ PluginParam * CPlugins::makeParam(const char * const id, const int value, Plugin
}
#endif
void CPlugins::startPlugin_by_name(const std::string & filename)
void CPlugins::startPlugin_by_name(const std::string & name)
{
for (int i = 0; i < (int) plugin_list.size(); i++)
{
if (!filename.compare(g_PluginList->getFileName(i)))
if (name.compare(g_PluginList->getName(i)) == 0)
{
startPlugin(i);
return;
@@ -355,13 +355,13 @@ void CPlugins::startPlugin_by_name(const std::string & filename)
}
}
void CPlugins::startPlugin(const char * const name)
void CPlugins::startPlugin(const char * const filename)
{
int pluginnr = find_plugin(name);
int pluginnr = find_plugin(filename);
if (pluginnr > -1)
startPlugin(pluginnr);
else
printf("[CPlugins] could not find %s\n", name);
printf("[CPlugins] could not find %s\n", filename);
}