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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
This commit is contained in:
Stefan Seyfried
2014-01-23 14:08:37 +01:00
parent 7d3843847a 3ad7175c45
commit b414474323
92 changed files with 2474 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/plugins.cpp
View File

@@ -69,7 +69,9 @@
#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 */
@@ -128,8 +130,10 @@ 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
@@ -343,6 +347,7 @@ void CPlugins::startScriptPlugin(int number)
}
}
#if ENABLE_LUA
void CPlugins::startLuaPlugin(int number)
{
const char *script = plugin_list[number].pluginfile.c_str();
@@ -357,6 +362,7 @@ void CPlugins::startLuaPlugin(int number)
lua->runScript(script);
delete lua;
}
#endif
void CPlugins::startPlugin(int number,int /*param*/)
{
@@ -383,11 +389,13 @@ 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",
@@ -657,8 +665,10 @@ 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;
}