mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 07:51:19 +02:00
Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes * needs additional tests, of course :-)
This commit is contained in:
@@ -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);
|
||||
|
||||
}
|
||||
|
||||
@@ -420,9 +420,11 @@ void CPlugins::startLuaPlugin(int number)
|
||||
script, plugin_list[number].cfgfile.c_str());
|
||||
return;
|
||||
}
|
||||
#ifdef ENABLE_LUA
|
||||
CLuaInstance *lua = new CLuaInstance();
|
||||
lua->runScript(script);
|
||||
delete lua;
|
||||
#endif
|
||||
#if 0
|
||||
frameBuffer->ClearFB();
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user