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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bdc2be1c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)


------------------
No further description and justification available within origin commit message!

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

src/gui/components/cc_draw.cpp

@@ -729,14 +729,21 @@ void CCDraw::hide()
 //erase or paint over rendered objects
 void CCDraw::kill(const fb_pixel_t& bg_color, const int& corner_radius, const int& fblayer_type /*fbdata_type*/)
 {
+	int layers = fblayer_type;
+
+	if (fblayer_type & ~CC_FBDATA_TYPES)
+		layers = CC_FBDATA_TYPES;
+
 	for(size_t i =0; i< v_fbdata.size() ;i++){
-		if (fblayer_type == CC_FBDATA_TYPES || v_fbdata[i].fbdata_type & fblayer_type){
+		if (v_fbdata[i].fbdata_type & layers){
-#if 0
+
-		if (bg_color != COL_BACKGROUND_PLUS_0)
+			int r = 0;
-#endif
+
-			int r =  v_fbdata[i].r;
+			if (corner_radius > -1){
-			if (corner_radius > -1)
+				r = v_fbdata[i].r;
-				r = corner_radius;
+				if (corner_radius != v_fbdata[i].r)
+					r = corner_radius;
+			}
 
 			if (v_fbdata[i].dx > 0 && v_fbdata[i].dy > 0){
 				frameBuffer->paintBoxRel(v_fbdata[i].x,
@@ -745,31 +752,28 @@ void CCDraw::kill(const fb_pixel_t& bg_color, const int& corner_radius, const in
 							v_fbdata[i].dy,
 							bg_color,
 							r,
-							corner_type);
+							v_fbdata[i].rtype);
+
+				if (v_fbdata[i].fbdata_type & CC_FBDATA_TYPE_FRAME){
+					if (v_fbdata[i].frame_thickness)
+							frameBuffer->paintBoxFrame(v_fbdata[i].x,
+										v_fbdata[i].y,
+										v_fbdata[i].dx,
+										v_fbdata[i].dy,
+										v_fbdata[i].frame_thickness,
+										bg_color,
+										v_fbdata[i].r,
+										v_fbdata[i].rtype);
+					}
 			}else
 				dprintf(DEBUG_DEBUG, "\033[33m[CCDraw][%s - %d], WARNING! render with bad dimensions [dx = %d dy = %d]\033[0m\n", __func__, __LINE__, v_fbdata[i].dx, v_fbdata[i].dy );
 
-			if (v_fbdata[i].frame_thickness)
-					frameBuffer->paintBoxFrame(v_fbdata[i].x,
-								   v_fbdata[i].y,
-								   v_fbdata[i].dx,
-								   v_fbdata[i].dy,
-								   v_fbdata[i].frame_thickness,
-								   bg_color,
-								   r,
-								   corner_type);
 			v_fbdata[i].is_painted = false;
-#if 0
-		else
-			frameBuffer->paintBackgroundBoxRel(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy);
-#endif
 		}
 	}
 
-	if (fblayer_type == CC_FBDATA_TYPES){
+	firstPaint = true;
-		firstPaint = true;
+	is_painted = false;
-		is_painted = false;
-	}
 }
 
 void CCDraw::killShadow(const fb_pixel_t& bg_color, const int& corner_radius)

src/gui/components/cc_draw.h

@@ -396,7 +396,7 @@ class CCDraw : public COSDFader, public CComponentsSignals
 		 *	Shadow paint must be reworked, because dimensions of shadow containes not the real defined size. Parts of item are killed too.
 		 *
 		*/
-		virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, const int& corner_radius = -1, const int& fblayer_type = CC_FBDATA_TYPES);
+		virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, const int& corner_radius = -1, const int& fblayer_type = ~CC_FBDATA_TYPES);
 
 		/**Erase shadow around rendered item.
 		 * This is similar with the kill() member, but shadow will be handled only.

src/gui/components/cc_frm_header.cpp

@@ -258,7 +258,7 @@ void CComponentsHeader::initIcon()
 
 		//set corner mode of icon item
 		int cc_icon_corner_type = CORNER_LEFT;
-		if (corner_type == CORNER_TOP_LEFT || corner_type == CORNER_TOP)
+		if (corner_type & CORNER_TOP_LEFT || corner_type & CORNER_TOP)
 			cc_icon_corner_type = CORNER_TOP_LEFT;
 
 		cch_icon_obj->setCorner(corner_rad-fr_thickness, cc_icon_corner_type);

src/gui/components/cc_frm_header.h

@@ -315,7 +315,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen, CCHeaderT
 		///hides item, arg: no_restore see hideCCItem()
 		void hide(){disableClock(); CComponentsForm::hide();}
 		///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer
-		void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, const int& corner_radius = -1, const int& fblayer_type = CC_FBDATA_TYPES, bool disable_clock = true);
+		void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, const int& corner_radius = -1, const int& fblayer_type = ~CC_FBDATA_TYPES, bool disable_clock = true);
 
 		///set color gradient on/off, returns true if gradient mode was changed
 		virtual bool enableColBodyGradient(const int& enable_mode, const fb_pixel_t& sec_color = 255 /*=COL_BACKGROUND*/, const int& direction = -1);

src/gui/components/cc_item.h

@@ -100,7 +100,7 @@ class CComponentsItem : public CComponents
 		 * 	gui/color.h
 		 * 	driver/framebuffer.h
 		*/
-		virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, bool ignore_parent = false, const int& fblayer_type = CC_FBDATA_TYPES);
+		virtual void kill(const fb_pixel_t& bg_color = COL_BACKGROUND_PLUS_0, bool ignore_parent = false, const int& fblayer_type = ~CC_FBDATA_TYPES);
 
 		///get the current item type, see attribute cc_item_type above
 		virtual int getItemType();

src/gui/components/cc_types.h

@@ -100,7 +100,7 @@ typedef enum
 	CC_FBDATA_TYPE_FRAME		= 8,
 	CC_FBDATA_TYPE_BACKGROUND 	= 16,
 
-	CC_FBDATA_TYPES			= 32
+	CC_FBDATA_TYPES			= CC_FBDATA_TYPE_BOX | CC_FBDATA_TYPE_SHADOW_BOX | CC_FBDATA_TYPE_FRAME
 }FBDATA_TYPES;
 
 //fb color gradient types

src/nhttpd/tuxboxapi/neutrinoapi.cpp

@@ -29,6 +29,7 @@
 #include <driver/pictureviewer/pictureviewer.h>
 #include <system/helpers.h>
 #include <system/httptool.h>
+#include <system/helpers.h>
 #include <gui/color.h>
 #include <gui/widget/icons.h>
 #include <gui/movieplayer.h>
@@ -556,14 +557,13 @@ void CNeutrinoAPI::SendAllTimers(std::string url, bool force)
 	timerlist.clear();
 	Timerd->getTimerList(timerlist);
 	sort(timerlist.begin(), timerlist.end());
-	CTimerd::TimerList::iterator timer = timerlist.begin();
 
 	int pre,post;
 	Timerd->getRecordingSafety(pre,post);
 	CHTTPTool httpTool;
 	std::string r_url;
 
-	for(int i = 0; timer != timerlist.end(); ++timer)
+	for(CTimerd::TimerList::iterator timer = timerlist.begin(); timer != timerlist.end(); ++timer)
 	{
 		if (timer->eventType == CTimerd::TIMER_RECORD) {
 			r_url = "http://";