mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent c0910d6be4 a41206902f
commit 3f75ef5f47
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/plugins.cpp
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);
}
@@ -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