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

Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'

Browse Source 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
This commit is contained in:
Stefan Seyfried
2012-07-22 14:09:43 +02:00
parent b04ab099b2 6e0bc85a6c
commit ae1b98aa38
354 changed files with 17604 additions and 32020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/plugins.cpp
View File

@@ -33,8 +33,6 @@
#include <config.h>
#endif
#include <gui/plugins.h>
#include <sstream>
#include <fstream>
#include <iostream>
@@ -42,8 +40,11 @@
#include <dirent.h>
#include <dlfcn.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <sys/ioctl.h>
@@ -52,6 +53,7 @@
#include <zapit/client/zapittools.h>
#include "plugins.h"
/* for alexW images with old drivers:
* #define USE_VBI_INTERFACE 1
*/
@@ -70,7 +72,8 @@ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
CPlugins::CPlugins()
{
frameBuffer = NULL;
number_of_plugins = 0;
}
bool CPlugins::plugin_exists(const std::string & filename)
@@ -90,10 +93,9 @@ int CPlugins::find_plugin(const std::string & filename)
bool CPlugins::pluginfile_exists(const std::string & filename)
{
FILE *file = fopen(filename.c_str(),"r");
if (file != NULL)
struct stat stat_buf;
if(::stat(filename.c_str(), &stat_buf) == 0)
{
fclose(file);
return true;
} else
{
@@ -215,10 +217,6 @@ bool CPlugins::parseCfg(plugin *plugin_data)
{
plugin_data->key = atoi(parm.c_str());
}
else if (cmd == "pluginversion")
{
plugin_data->version = atoi(parm.c_str());
}
else if (cmd == "name")
{
plugin_data->name = parm;
@@ -326,16 +324,19 @@ void CPlugins::startScriptPlugin(int number)
script, plugin_list[number].cfgfile.c_str());
return;
}
FILE *f = popen(script,"r");
if (f != NULL)
{
char output[1024];
while (fgets(output,1024,f))
char *output=NULL;
size_t len = 0;
while (( getline(&output, &len, f)) != -1)
{
scriptOutput += output;
}
pclose(f);
if(output)
free(output);
}
else
{
@@ -601,7 +602,7 @@ void CPlugins::startPlugin(int number,int /*param*/)
bool CPlugins::hasPlugin(CPlugins::p_type_t type)
{
for (std::vector<plugin>::iterator it=plugin_list.begin();
it!=plugin_list.end(); it++)
it!=plugin_list.end(); ++it)
{
if (it->type == type && !it->hide)
return true;