Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	configure.ac
	src/gui/screensaver.cpp
	src/gui/volumebar.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)



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

configure.ac

@@ -91,6 +91,7 @@ AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
 TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
 TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2)
+CPPFLAGS+=" $(freetype-config --cflags)"
 AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher])
 	AC_TRY_CPP([
 		#include <ft2build.h>

src/gui/channellist.cpp

@@ -2438,6 +2438,7 @@ void CChannelList::paint_events(CChannelEventList &evtlist)
 		evt.description = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS);
 		evt.eventID = 0;
 		evt.startTime = 0;
+		evt.duration = 0;
 		evtlist.push_back(evt);
 	}
 

src/gui/components/cc_item_picture.cpp

@@ -386,6 +386,8 @@ CComponentsChannelLogo::CComponentsChannelLogo( const int &x_pos, const int &y_p
 
 void CComponentsChannelLogo::init(const uint64_t& channelId, const std::string& channelName, bool allow_scale)
 {
+	channel_name = "";
+	channel_id = 0;
 	alt_pic_name = "";
 	setChannel(channelId, channelName);
 	do_scale = allow_scale;

src/gui/lua/lua_curl.cpp

@@ -178,7 +178,7 @@ Example:
 	CLuaCurl *D = CurlCheckData(L, 1);
 	if (!D) return 0;
 
-	char errMsg[1024];
+	char errMsg[1024]={0};
 	CURL *curl_handle = curl_easy_init();
 	if (!curl_handle) {
 		memset(errMsg, '\0', sizeof(errMsg));
@@ -309,7 +309,7 @@ Example:
 #endif
 	}
 
-	char cerror[CURL_ERROR_SIZE];
+	char cerror[CURL_ERROR_SIZE]={0};
 	curl_easy_setopt(curl_handle, CURLOPT_ERRORBUFFER, cerror);
 
 	printf("\n[curl:download] download %s => %s\n", url.c_str(), (toFile)?outputfile.c_str():"return string");
@@ -330,7 +330,7 @@ Example:
 		CURLcode res1 = curl_easy_getinfo(curl_handle, CURLINFO_EFFECTIVE_URL, &deffektive);
 		CURLcode res2 = curl_easy_getinfo(curl_handle, CURLINFO_REDIRECT_URL, &dredirect);
 
-		char msg1[1024];
+		char msg1[1024]={0};
 		memset(msg1, '\0', sizeof(msg1));
 		snprintf(msg1, sizeof(msg1)-1, "\n[curl:download] O.K. size: %.0f bytes, time: %.02f sec.", dsize, dtime);
 		msg = msg1;

src/gui/lua/lua_menue.h

@@ -62,7 +62,7 @@ class CLuaMenuForwarder : public CMenuTarget
 		std::string luaId;
 		CLuaMenuForwarder(lua_State *L, std::string _luaAction, std::string _luaId);
 		~CLuaMenuForwarder();
-		int exec(CMenuTarget* parent, const std::string & actionKey);
+		int exec(CMenuTarget* parent=NULL, const std::string & actionKey="");
 };
 
 class CLuaMenuFilebrowser : public CLuaMenuForwarder
@@ -74,7 +74,7 @@ class CLuaMenuFilebrowser : public CLuaMenuForwarder
 		void Init(std::string *_value, bool _dirMode);
 	public:
 		CLuaMenuFilebrowser(lua_State *_L, std::string _luaAction, std::string _luaId, std::string *_value, bool _dirMode);
-		int exec(CMenuTarget* parent, const std::string & actionKey);
+		int exec(CMenuTarget* parent=NULL, const std::string & actionKey="");
 		void addFilter(std::string s) { filter.push_back(s); };
 };
 
@@ -91,7 +91,7 @@ class CLuaMenuStringinput : public CLuaMenuForwarder
 		void Init(const char *_name, std::string *_value, int _size, std::string _valid_chars, CChangeObserver *_observ, const char *_icon, bool _sms);
 	public:
 		CLuaMenuStringinput(lua_State *_L, std::string _luaAction, std::string _luaId, const char *_name, std::string *_value, int _size, std::string _valid_chars, CChangeObserver *_observ, const char *_icon, bool _sms);
-		int exec(CMenuTarget* parent, const std::string & actionKey);
+		int exec(CMenuTarget* parent=NULL, const std::string & actionKey="");
 };
 
 class CLuaMenuKeyboardinput : public CLuaMenuForwarder
@@ -106,7 +106,7 @@ class CLuaMenuKeyboardinput : public CLuaMenuForwarder
 		void Init(const char *_name, std::string *_value, int _size, CChangeObserver *_observ, const char *_icon, std::string _help, std::string _help2);
 	public:
 		CLuaMenuKeyboardinput(lua_State *_L, std::string _luaAction, std::string _luaId, const char *_name, std::string *_value, int _size, CChangeObserver *_observ, const char *_icon, std::string _help, std::string _help2);
-		int exec(CMenuTarget* parent, const std::string & actionKey);
+		int exec(CMenuTarget* parent=NULL, const std::string & actionKey="");
 };
 
 class CLuaInstMenu

src/gui/tmdb.cpp

@@ -128,7 +128,7 @@ bool cTmdb::getUrl(std::string &url, std::string &answer, CURL *_curl_handle)
 		}
 	}
 
-	char cerror[CURL_ERROR_SIZE];
+	char cerror[CURL_ERROR_SIZE] = {0};
 	curl_easy_setopt(_curl_handle, CURLOPT_ERRORBUFFER, cerror);
 
 	printf("try to get [%s] ...\n", url.c_str());
@@ -169,7 +169,7 @@ bool cTmdb::DownloadUrl(std::string url, std::string file, CURL *_curl_handle)
 		}
 	}
 
-	char cerror[CURL_ERROR_SIZE];
+	char cerror[CURL_ERROR_SIZE] = {0};
 	curl_easy_setopt(_curl_handle, CURLOPT_ERRORBUFFER, cerror);
 
 	printf("try to get [%s] ...\n", url.c_str());

src/system/ytcache.cpp

@@ -148,7 +148,7 @@ bool cYTCache::download(MI_MOVIE_INFO *mi)
 	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, (long)0); 
 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
 
-	char cerror[CURL_ERROR_SIZE];
+	char cerror[CURL_ERROR_SIZE] = {0};
 	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, cerror);
 
 	if(!g_settings.softupdate_proxyserver.empty()) {

src/system/ytparser.cpp

@@ -151,7 +151,7 @@ bool cYTFeedParser::getUrl(std::string &url, std::string &answer, CURL *_curl_ha
 		}
 	}
 
-	char cerror[CURL_ERROR_SIZE];
+	char cerror[CURL_ERROR_SIZE] = {0};
 	curl_easy_setopt(_curl_handle, CURLOPT_ERRORBUFFER, cerror);
 
 	printf("try to get [%s] ...\n", url.c_str());
@@ -192,7 +192,7 @@ bool cYTFeedParser::DownloadUrl(std::string &url, std::string &file, CURL *_curl
 		}
 	}
 
-	char cerror[CURL_ERROR_SIZE];
+	char cerror[CURL_ERROR_SIZE] = {0};
 	curl_easy_setopt(_curl_handle, CURLOPT_ERRORBUFFER, cerror);
 
 	printf("try to get [%s] ...\n", url.c_str());