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 branch 'uncool/dvbsi++' commit 'd493b1155c4'

Browse Source 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.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/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-10-14 12:51:07 +02:00
parent aa89482ff2 d493b1155c
commit a603ec74af
442 changed files with 7648 additions and 4167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/plugins.cpp
View File

@@ -47,10 +47,16 @@
#include <stdio.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
#include <global.h>
#include <neutrino.h>
#include <system/helpers.h>
#include <zapit/client/zapittools.h>
#include "plugins.h"
@@ -91,18 +97,6 @@ int CPlugins::find_plugin(const std::string & filename)
return -1;
}
bool CPlugins::pluginfile_exists(const std::string & filename)
{
struct stat stat_buf;
if(::stat(filename.c_str(), &stat_buf) == 0)
{
return true;
} else
{
return false;
}
}
void CPlugins::scanDir(const char *dir)
{
struct dirent **namelist;
@@ -318,13 +312,14 @@ void CPlugins::startScriptPlugin(int number)
{
const char *script = plugin_list[number].pluginfile.c_str();
printf("[CPlugins] executing script %s\n",script);
if (!pluginfile_exists(plugin_list[number].pluginfile))
if (!file_exists(script))
{
printf("[CPlugins] could not find %s,\nperhaps wrong plugin type in %s\n",
script, plugin_list[number].cfgfile.c_str());
return;
}
FILE *f = popen(script,"r");
pid_t pid = 0;
FILE *f = my_popen(pid,script,"r");
if (f != NULL)
{
char *output=NULL;
@@ -335,6 +330,9 @@ void CPlugins::startScriptPlugin(int number)
scriptOutput += output;
}
pclose(f);
int s;
while (waitpid(pid,&s,WNOHANG)>0);
kill(pid,SIGTERM);
if(output)
free(output);
}
@@ -344,7 +342,6 @@ void CPlugins::startScriptPlugin(int number)
}
}
int mysystem(char * cmd, char * arg1, char * arg2);
void CPlugins::startPlugin(int number,int /*param*/)
{
// always delete old output
@@ -370,7 +367,7 @@ void CPlugins::startPlugin(int number,int /*param*/)
startScriptPlugin(number);
return;
}
if (!pluginfile_exists(plugin_list[number].pluginfile))
if (!file_exists(plugin_list[number].pluginfile.c_str()))
{
printf("[CPlugins] could not find %s,\nperhaps wrong plugin type in %s\n",
plugin_list[number].pluginfile.c_str(), plugin_list[number].cfgfile.c_str());
@@ -593,7 +590,7 @@ void CPlugins::startPlugin(int number,int /*param*/)
frameBuffer->Lock();
//frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
printf("Starting %s\n", plugin_list[number].pluginfile.c_str());
mysystem((char *) plugin_list[number].pluginfile.c_str(), NULL, NULL);
my_system(plugin_list[number].pluginfile.c_str(), NULL, NULL);
//frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
frameBuffer->Unlock();
frameBuffer->paintBackground();