Merge branch 'uncool/dvbsi++' commit '9d968280bac'

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit

src/gui/plugins.cpp

@@ -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;