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

Revert "Add a --enable-lua switch to enable LUA support"

Browse Source 
This reverts commit c980278eb1.

This just makes the code unreadable and why would one build
without lua :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5525e9f4b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-23 14:11:03 +01:00
parent b7c804fc22
commit 12041ff30b
6 changed files with 6 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/plugins.cpp
View File

@@ -69,9 +69,7 @@
#endif
#include <daemonc/remotecontrol.h>
#if ENABLE_LUA
#include <gui/luainstance.h>
#endif
extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -130,10 +128,8 @@ void CPlugins::scanDir(const char *dir)
new_plugin.pluginfile = fname;
if (new_plugin.type == CPlugins::P_TYPE_SCRIPT)
new_plugin.pluginfile.append(".sh");
#if ENABLE_LUA
else if (new_plugin.type == CPlugins::P_TYPE_LUA)
new_plugin.pluginfile.append(".lua");
#endif
else
new_plugin.pluginfile.append(".so");
// We do not check if new_plugin.pluginfile exists since .cfg in
@@ -347,7 +343,6 @@ void CPlugins::startScriptPlugin(int number)
}
}
#if ENABLE_LUA
void CPlugins::startLuaPlugin(int number)
{
const char *script = plugin_list[number].pluginfile.c_str();
@@ -362,7 +357,6 @@ void CPlugins::startLuaPlugin(int number)
lua->runScript(script);
delete lua;
}
#endif
void CPlugins::startPlugin(int number,int /*param*/)
{
@@ -389,13 +383,11 @@ void CPlugins::startPlugin(int number,int /*param*/)
startScriptPlugin(number);
return;
}
#if ENABLE_LUA
if (plugin_list[number].type == CPlugins::P_TYPE_LUA)
{
startLuaPlugin(number);
return;
}
#endif
if (!file_exists(plugin_list[number].pluginfile.c_str()))
{
printf("[CPlugins] could not find %s,\nperhaps wrong plugin type in %s\n",
@@ -665,10 +657,8 @@ CPlugins::p_type_t CPlugins::getPluginType(int type)
case PLUGIN_TYPE_SCRIPT:
return P_TYPE_SCRIPT;
break;
#if ENABLE_LUA
case PLUGIN_TYPE_LUA:
return P_TYPE_LUA;
#endif
default:
return P_TYPE_DISABLED;
}