From 5525e9f4b5f7ea46369cfcbe927be62c92227cad Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 23 Jan 2014 14:11:03 +0100 Subject: [PATCH] Revert "Add a --enable-lua switch to enable LUA support" This reverts commit 82d4832013e3074b8e2a7a2ad762dfd5bdce2472. This just makes the code unreadable and why would one build without lua :-) --- configure.ac | 12 ------------ src/gui/plugins.cpp | 10 ---------- src/gui/plugins.h | 9 ++------- src/gui/user_menue.cpp | 7 ++----- src/gui/widget/menue.cpp | 17 +---------------- src/gui/widget/menue.h | 9 +-------- 6 files changed, 6 insertions(+), 58 deletions(-) diff --git a/configure.ac b/configure.ac index e02797435..5e00a3065 100644 --- a/configure.ac +++ b/configure.ac @@ -204,24 +204,12 @@ AC_ARG_ENABLE(pip, [AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])]) -AC_ARG_ENABLE(testmenu, - AS_HELP_STRING(--enable-testmenu,include test menu in neutrino main menu)) - AM_CONDITIONAL(ENABLE_TEST_MENU,test "$enable_testmenu" = "yes") if test "$enable_testmenu" = "yes"; then AC_DEFINE(ENABLE_TEST_MENU,1,[include test menu in neutrino main menu - not recommended for general users!]) fi -AC_ARG_ENABLE(lua, - AS_HELP_STRING(--enable-lua,enable LUA support)) - -AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes") -if test "$enable_lua" = "yes"; then - AC_DEFINE(ENABLE_LUA,1,[include LUA support]) -fi - - if test "$BOXTYPE" = "coolstream"; then if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the header file.]) diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp index 90f7b9691..49592b4e5 100644 --- a/src/gui/plugins.cpp +++ b/src/gui/plugins.cpp @@ -69,9 +69,7 @@ #endif #include -#if ENABLE_LUA #include -#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; } diff --git a/src/gui/plugins.h b/src/gui/plugins.h index 349219ec7..1bd6c614f 100644 --- a/src/gui/plugins.h +++ b/src/gui/plugins.h @@ -51,12 +51,8 @@ class CPlugins P_TYPE_DISABLED = 0x1, P_TYPE_GAME = 0x2, P_TYPE_TOOL = 0x4, - P_TYPE_SCRIPT = 0x8 - -#if ENABLE_LUA - , + P_TYPE_SCRIPT = 0x8, P_TYPE_LUA = 0x10 -#endif } p_type_t; @@ -127,9 +123,8 @@ class CPlugins void startPlugin(int number,int param); void start_plugin_by_name(const std::string & filename,int param);// start plugins by "name=" in .cfg void startScriptPlugin(int number); -#if ENABLE_LUA void startLuaPlugin(int number); -#endif + void startPlugin(const char * const filename); // start plugins also by name bool hasPlugin(CPlugins::p_type_t type); diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 744294743..db0abe2ce 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -311,11 +311,8 @@ bool CUserMenu::showUserMenu(int button) int cnt = 0; for (unsigned int count = 0; count < (unsigned int) g_PluginList->getNumberOfPlugins(); count++) { - bool show = g_PluginList->getType(count) == CPlugins::P_TYPE_TOOL; - -#if ENABLE_LUA - show = show || g_PluginList->getType(count) == CPlugins::P_TYPE_LUA; -#endif + bool show = g_PluginList->getType(count) == CPlugins::P_TYPE_TOOL || + g_PluginList->getType(count) == CPlugins::P_TYPE_LUA; if (show && !g_PluginList->isHidden(count)) { sprintf(id, "%d", count); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 1259933fb..2a248fd11 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1275,12 +1275,10 @@ int CMenuOptionNumberChooser::exec(CMenuTarget*) else (*optionValue)++; } -#if ENABLE_LUA if(observ && !luaAction.empty()) { // optionValue is int* observ->changeNotify(luaState, luaAction, luaId, (void *) to_string(*optionValue).c_str()); } else -#endif if(observ) observ->changeNotify(name, optionValue); @@ -1501,9 +1499,8 @@ int CMenuOptionChooser::exec(CMenuTarget*) { bool wantsRepaint = false; int ret = menu_return::RETURN_NONE; -#if ENABLE_LUA char *optionValname = NULL; -#endif + if (optionsSort) { optionsSort = false; clearChooserOptions(); @@ -1556,9 +1553,7 @@ int CMenuOptionChooser::exec(CMenuTarget*) if(select >= 0) { *optionValue = options[select].key; -#if ENABLE_LUA optionValname = (char *) options[select].valname; -#endif } delete menu; delete selector; @@ -1567,31 +1562,23 @@ int CMenuOptionChooser::exec(CMenuTarget*) if (options[count].key == (*optionValue)) { if(msg == CRCInput::RC_left) { if(count > 0) -#if ENABLE_LUA optionValname = (char *) options[(count-1) % number_of_options].valname, -#endif *optionValue = options[(count-1) % number_of_options].key; else -#if ENABLE_LUA optionValname = (char *) options[number_of_options-1].valname, -#endif *optionValue = options[number_of_options-1].key; } else -#if ENABLE_LUA optionValname = (char *) options[(count+1) % number_of_options].valname, -#endif *optionValue = options[(count+1) % number_of_options].key; break; } } } paint(true); -#if ENABLE_LUA if(observ && !luaAction.empty()) { if (optionValname) wantsRepaint = observ->changeNotify(luaState, luaAction, luaId, optionValname); } else -#endif if(observ) wantsRepaint = observ->changeNotify(name, optionValue); @@ -1752,11 +1739,9 @@ int CMenuOptionStringChooser::exec(CMenuTarget* parent) paint(true); } -#if ENABLE_LUA if(observ && !luaAction.empty()) wantsRepaint = observ->changeNotify(luaState, luaAction, luaId, (void *)(optionValueString ? optionValueString->c_str() : "")); else -#endif if(observ) { wantsRepaint = observ->changeNotify(name, (void *)(optionValueString ? optionValueString->c_str() : "")); } diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index d80d446c3..5eac43348 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -45,13 +45,11 @@ #include #include -#if ENABLE_LUA extern "C" { #include #include #include } -#endif #define NO_WIDGET_ID -1 @@ -77,12 +75,10 @@ class CChangeObserver { return false; } -#if ENABLE_LUA virtual bool changeNotify(lua_State * /*L*/, const std::string & /*luaId*/, const std::string & /*luaAction*/, void * /*Data*/) { return false; } -#endif }; class CMenuTarget @@ -107,11 +103,9 @@ class CMenuItem fb_pixel_t item_color, item_bgcolor; void initItemColors(const bool select_mode); -#if ENABLE_LUA lua_State *luaState; std::string luaAction; std::string luaId; -#endif neutrino_locale_t name; std::string nameString; @@ -176,9 +170,8 @@ class CMenuItem void setHint(const std::string icon, const neutrino_locale_t text) { hintIcon = icon; hint = text; } void setHint(const std::string icon, const std::string text) { hintIcon = icon; hintText = text; } -#if ENABLE_LUA void setLua(lua_State *_luaState, std::string &_luaAction, std::string &_luaId) { luaState = _luaState; luaAction = _luaAction; luaId = _luaId; }; -#endif + virtual const char *getName(); };