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

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

Browse Source 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-04-27 19:14:06 +02:00
parent 1dca2e2551 91ed0a0b33
commit 8df9ff12cc
178 changed files with 6683 additions and 3601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

255
src/gui/plugins.cpp
View File

@@ -53,14 +53,6 @@
#include <zapit/client/zapittools.h>
#include "plugins.h"
/* for alexW images with old drivers:
* #define USE_VBI_INTERFACE 1
*/
#ifdef USE_VBI_INTERFACE
#define AVIA_VBI_START_VTXT 1
#define AVIA_VBI_STOP_VTXT 2
#endif
#include <daemonc/remotecontrol.h>
#include <gui/luainstance.h>
@@ -69,7 +61,6 @@ extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
#define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_USB "/mnt/usb/tuxbox/plugins"
CPlugins::CPlugins()
{
@@ -77,6 +68,11 @@ CPlugins::CPlugins()
number_of_plugins = 0;
}
CPlugins::~CPlugins()
{
plugin_list.clear();
}
bool CPlugins::plugin_exists(const std::string & filename)
{
return (find_plugin(filename) >= 0);
@@ -151,22 +147,14 @@ void CPlugins::loadPlugins()
plugin_list.clear();
sindex = 100;
scanDir(g_settings.plugin_hdd_dir.c_str());
scanDir(PLUGINDIR_USB);
scanDir(PLUGINDIR_VAR);
scanDir(PLUGINDIR);
sort (plugin_list.begin(), plugin_list.end());
}
CPlugins::~CPlugins()
{
plugin_list.clear();
}
bool CPlugins::parseCfg(plugin *plugin_data)
{
// FILE *fd;
std::ifstream inFile;
std::string line[20];
int linecount = 0;
@@ -280,13 +268,13 @@ PluginParam * CPlugins::makeParam(const char * const id, const int value, Plugin
return makeParam(id, aval, next);
}
void CPlugins::start_plugin_by_name(const std::string & filename,int param)
void CPlugins::startPlugin_by_name(const std::string & name)
{
for (int i = 0; i < (int) plugin_list.size(); i++)
{
if (filename.compare(g_PluginList->getName(i))==0)
if (name.compare(g_PluginList->getName(i))==0)
{
startPlugin(i,param);
startPlugin(i);
return;
}
}
@@ -296,7 +284,7 @@ void CPlugins::startPlugin(const char * const name)
{
int pluginnr = find_plugin(name);
if (pluginnr > -1)
startPlugin(pluginnr,0);
startPlugin(pluginnr);
else
printf("[CPlugins] could not find %s\n", name);
@@ -351,7 +339,7 @@ void CPlugins::startLuaPlugin(int number)
delete lua;
}
void CPlugins::startPlugin(int number,int /*param*/)
void CPlugins::startPlugin(int number)
{
// always delete old output
delScriptOutput();
@@ -366,9 +354,8 @@ void CPlugins::startPlugin(int number,int /*param*/)
sprintf(tmp, "%d", g_settings.screen_EndY);
setenv("SCREEN_END_Y", tmp, 1);
//bool ispip = strncmp(plugin_list[number].pluginfile.c_str(), "pip", 3) ? false : true;
bool ispip = strstr(plugin_list[number].pluginfile.c_str(), "pip") != 0;
//printf("exec: %s pip: %d\n", plugin_list[number].pluginfile.c_str(), ispip);
//printf("exec: %s pip: %d\n", plugin_list[number].pluginfile.c_str(), ispip);
if (ispip && !g_RemoteControl->is_video_started)
return;
if (plugin_list[number].type == CPlugins::P_TYPE_SCRIPT)
@@ -388,229 +375,15 @@ void CPlugins::startPlugin(int number,int /*param*/)
return;
}
#if 0
PluginExec execPlugin;
char depstring[129];
char *argv[20];
void *libhandle[20];
int argc = 0, i = 0, lcd_fd=-1;
char *p;
char *np;
void *handle;
char * error;
int vtpid = 0;
PluginParam * startparam = 0;
#endif
g_RCInput->clearRCMsg();
#if 0
if (plugin_list[number].fb)
{
startparam = makeParam(P_ID_FBUFFER , frameBuffer->getFileHandle() , startparam);
}
if (plugin_list[number].rc)
{
startparam = makeParam(P_ID_RCINPUT , g_RCInput->getFileHandle() , startparam);
startparam = makeParam(P_ID_RCBLK_ANF, g_settings.repeat_genericblocker, startparam);
startparam = makeParam(P_ID_RCBLK_REP, g_settings.repeat_blocker , startparam);
}
else
{
g_RCInput->stopInput();
}
if (plugin_list[number].lcd)
{
CLCD::getInstance()->pause();
lcd_fd = open("/dev/dbox/lcd0", O_RDWR);
startparam = makeParam(P_ID_LCD , lcd_fd , startparam);
}
if (plugin_list[number].vtxtpid)
{
vtpid = g_RemoteControl->current_PIDs.PIDs.vtxtpid;
#ifdef USE_VBI_INTERFACE
int fd = open("/dev/dbox/vbi0", O_RDWR);
if (fd > 0)
{
ioctl(fd, AVIA_VBI_STOP_VTXT, 0);
close(fd);
}
#endif
if (param>0)
vtpid=param;
startparam = makeParam(P_ID_VTXTPID, vtpid, startparam);
}
if (plugin_list[number].needoffset)
{
startparam = makeParam(P_ID_VFORMAT , g_settings.video_Format , startparam);
startparam = makeParam(P_ID_OFF_X , g_settings.screen_StartX , startparam);
startparam = makeParam(P_ID_OFF_Y , g_settings.screen_StartY , startparam);
startparam = makeParam(P_ID_END_X , g_settings.screen_EndX , startparam);
startparam = makeParam(P_ID_END_Y , g_settings.screen_EndY , startparam);
}
PluginParam *par = startparam;
for ( ; par; par=par->next )
{
printf("[CPlugins] (id,val):(%s,%s)\n", par->id, par->val);
}
std::string pluginname = plugin_list[number].filename;
strcpy(depstring, plugin_list[number].depend.c_str());
argc=0;
if ( depstring[0] )
{
p=depstring;
while ( 1 )
{
argv[ argc ] = p;
argc++;
np = strchr(p,',');
if ( !np )
break;
*np=0;
p=np+1;
if ( argc == 20 ) // mehr nicht !
break;
}
}
for ( i=0; i<argc; i++ )
{
std::string libname = argv[i];
printf("[CPlugins] try load shared lib : %s\n",argv[i]);
libhandle[i] = dlopen ( *argv[i] == '/' ?
argv[i] : (PLUGINDIR "/"+libname).c_str(),
RTLD_NOW | RTLD_GLOBAL );
if ( !libhandle[i] )
{
fputs (dlerror(), stderr);
break;
}
}
if ( i == argc ) // alles geladen
{
//bool ispip = strncmp(plugin_list[number].pluginfile.c_str(), "pip", 3) ? true : false;
handle = dlopen ( plugin_list[number].pluginfile.c_str(), RTLD_NOW);
if (!handle)
{
fputs (dlerror(), stderr);
} else {
execPlugin = (PluginExec) dlsym(handle, "plugin_exec");
if ((error = dlerror()) != NULL)
{
fputs(error, stderr);
dlclose(handle);
} else {
printf("[CPlugins] try exec...\n");
if (ispip) {
g_Sectionsd->setPauseScanning (true);
g_Zapit->setEventMode(false);
if (g_Zapit->isPlayBackActive()) {
if (!CNeutrinoApp::getInstance()->recordingstatus)
g_Zapit->setRecordMode(true);
} else {
/* no playback, we playing file ? zap to channel */
t_channel_id current_channel = g_Zapit->getCurrentServiceID();
g_Zapit->zapTo_serviceID(current_channel);
}
}
g_RCInput->close_click();
#ifndef FB_USE_PALETTE
if (plugin_list[number].fb) {
frameBuffer->setMode(720, 576, 8);
frameBuffer->paletteSet();
}
#endif
execPlugin(startparam);
dlclose(handle);
printf("[CPlugins] exec done...\n");
g_RCInput->open_click();
}
}
//restore framebuffer...
//#if 0
// g_RCInput->open_click();
//#endif
//if (!plugin_list[number].rc)
g_RCInput->restartInput();
g_RCInput->clearRCMsg();
if (plugin_list[number].lcd)
{
if (lcd_fd != -1)
close(lcd_fd);
CLCD::getInstance()->resume();
}
if (plugin_list[number].fb)
{
#ifdef FB_USE_PALETTE
frameBuffer->paletteSet();
#else
frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
#endif
}
frameBuffer->paintBackgroundBox(0,0,720,576);
if (ispip) {
if (!CNeutrinoApp::getInstance()->recordingstatus) {
g_Zapit->setRecordMode(false);
}
g_Zapit->setEventMode(true);
g_Sectionsd->setPauseScanning (false);
}
#ifdef USE_VBI_INTERFACE
if (plugin_list[number].vtxtpid)
{
if (vtpid != 0)
{
// versuche, den gtx/enx_vbi wieder zu starten
int fd = open("/dev/dbox/vbi0", O_RDWR);
if (fd > 0)
{
ioctl(fd, AVIA_VBI_START_VTXT, vtpid);
close(fd);
}
}
}
#endif
}
/* unload shared libs */
for ( i=0; i<argc; i++ )
{
if ( libhandle[i] )
dlclose(libhandle[i]);
else
break;
}
for (par = startparam ; par; )
{
/* we must not free par->id, since it is the original */
free(par->val);
PluginParam * tmp = par;
par = par->next;
delete tmp;
}
g_RCInput->clearRCMsg();
#else
g_RCInput->clearRCMsg();
g_RCInput->stopInput();
/* stop automatic updates etc. */
frameBuffer->Lock();
//frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
printf("Starting %s\n", plugin_list[number].pluginfile.c_str());
my_system(2, plugin_list[number].pluginfile.c_str(), NULL);
//frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
frameBuffer->Unlock();
frameBuffer->paintBackground();
g_RCInput->restartInput();
g_RCInput->clearRCMsg();
#endif
}
bool CPlugins::hasPlugin(CPlugins::p_type_t type)
@@ -656,5 +429,3 @@ CPlugins::p_type_t CPlugins::getPluginType(int type)
return P_TYPE_DISABLED;
}
}