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

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 8f2cbeb841 73da438ec4
commit af8fe3ebc6
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/plugins.cpp
View File

@@ -4,13 +4,7 @@
Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/
Kommentar:
Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert
auf der Client-Server Idee, diese GUI ist also von der direkten DBox-
Steuerung getrennt. Diese wird dann von Daemons uebernommen.
Copyright (C) 2011-2014 Stefan Seyfried
License: GPL
@@ -128,7 +122,7 @@ void CPlugins::scanDir(const char *dir)
new_plugin.pluginfile.append(".sh");
else if (new_plugin.type == CPlugins::P_TYPE_LUA)
new_plugin.pluginfile.append(".lua");
else
else // CPlugins::P_TYPE_GAME or CPlugins::P_TYPE_TOOL
new_plugin.pluginfile.append(".so");
// We do not check if new_plugin.pluginfile exists since .cfg in
// PLUGINDIR_VAR can overwrite settings in read only dir
@@ -137,7 +131,6 @@ void CPlugins::scanDir(const char *dir)
// already exists in the list.
// This behavior is used to make sure plugins can be disabled
// by creating a .cfg in PLUGINDIR_VAR (PLUGINDIR often is read only).
if (!plugin_exists(new_plugin.filename))
{
plugin_list.push_back(new_plugin);
@@ -430,7 +423,7 @@ void CPlugins::startLuaPlugin(int number)
CLuaInstance *lua = new CLuaInstance();
lua->runScript(script);
delete lua;
#if HAVE_SPARK_HARDWARE
#if 0
frameBuffer->ClearFB();
#endif
videoDecoder->Pig(-1, -1, -1, -1);
@@ -443,25 +436,25 @@ void CPlugins::startPlugin(int number)
delScriptOutput();
/* export neutrino settings to the environment */
char tmp[32];
#if HAVE_SPARK_HARDWARE
#if 0
sprintf(tmp, "%d", g_settings.screen_StartX_int);
#else
sprintf(tmp, "%d", g_settings.screen_StartX);
#endif
setenv("SCREEN_OFF_X", tmp, 1);
#if HAVE_SPARK_HARDWARE
#if 0
sprintf(tmp, "%d", g_settings.screen_StartY_int);
#else
sprintf(tmp, "%d", g_settings.screen_StartY);
#endif
setenv("SCREEN_OFF_Y", tmp, 1);
#if HAVE_SPARK_HARDWARE
#if 0
sprintf(tmp, "%d", g_settings.screen_EndX_int);
#else
sprintf(tmp, "%d", g_settings.screen_EndX);
#endif
setenv("SCREEN_END_X", tmp, 1);
#if HAVE_SPARK_HARDWARE
#if 0
sprintf(tmp, "%d", g_settings.screen_EndY_int);
#else
sprintf(tmp, "%d", g_settings.screen_EndY);
@@ -503,7 +496,7 @@ void CPlugins::startPlugin(int number)
my_system(2, plugin_list[number].pluginfile.c_str(), NULL);
//frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
frameBuffer->Unlock();
#if HAVE_SPARK_HARDWARE
#if 0
frameBuffer->ClearFB();
#endif
videoDecoder->Pig(-1, -1, -1, -1);
@@ -517,7 +510,7 @@ bool CPlugins::hasPlugin(CPlugins::p_type_t type)
for (std::vector<plugin>::iterator it=plugin_list.begin();
it!=plugin_list.end(); ++it)
{
if (it->type == type && !it->hide)
if ((it->type & type) && !it->hide)
return true;
}
return false;