Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: 020f044c07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)

src/gui/channellist.cpp

@@ -119,7 +119,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
 	fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
 	fdescrheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight();
 
-	previous_channellist_additional = -1;
+	previous_channellist_additional = g_settings.channellist_additional;
 	eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
 	dline = NULL;
 
@@ -298,7 +298,7 @@ int CChannelList::doChannelMenu(void)
 	int shortcut = 0;
 	static int old_selected = 0;
 	char cnt[5];
-	bool unlocked = true;
+
 	int ret = 0;
 
 	if(g_settings.minimode)
@@ -361,8 +361,11 @@ int CChannelList::doChannelMenu(void)
 		bool fav_found = true;
 		switch(select) {
 			case 0: // edit mode
+				{
+					bool unlocked = true;
 					if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED) {
 						int pl_z = g_settings.parentallock_zaptime * 60;
+
 						if (g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT] == CPersonalizeGui::PERSONALIZE_MODE_PIN) {
 							unlocked = false;
 						} else if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked) {
@@ -383,8 +386,10 @@ int CChannelList::doChannelMenu(void)
 					}
 					if (unlocked)
 						editMode(true);
+
 					ret = -1;
 					break;
+				}
 			case 1: // add to
 				if (!addChannelToBouquet())
 					return -1;
@@ -484,7 +489,7 @@ void CChannelList::calcSize()
 		fheight = 1; /* avoid div-by-zero crash on invalid font */
 	footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+6;
 
-	minitv_is_active = ( (g_settings.channellist_additional == 2) && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
+	minitv_is_active = ( (g_settings.channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV) && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
 	// calculate width
 	full_width = minitv_is_active ? (frameBuffer->getScreenWidth()-2*DETAILSLINE_WIDTH) : frameBuffer->getScreenWidthRel();
 
@@ -951,7 +956,7 @@ int CChannelList::show()
 void CChannelList::hide()
 {
 	paint_events(-2); // cancel paint_events thread
-	if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV
+	if ((g_settings.channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV) || (previous_channellist_additional == SNeutrinoSettings::CHANNELLIST_ADDITIONAL_MODE_MINITV)) // with miniTV
 	{
 		if (cc_minitv){
 			delete cc_minitv; cc_minitv = NULL;

src/gui/epgplus.cpp

@@ -243,6 +243,7 @@ void EpgPlus::TimeLine::paintMark(time_t _startTime, int pduration, int px, int
 	// paint new mark
 	CProgressBar pbbar = CProgressBar(px, this->y + this->font->getHeight(), pwidth, this->font->getHeight());
 	pbbar.setActiveColor(COL_MENUCONTENTSELECTED_PLUS_0);
+	pbbar.setType(CProgressBar::PB_TIMESCALE);
 
 	time_t currentTime;
 	time(&currentTime);

src/gui/movieplayer.cpp

@@ -28,7 +28,10 @@
 #include <config.h>
 #endif
 
+#ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
+#endif
+
 #include <stdint.h>
 #include <global.h>
 #include <neutrino.h>

src/gui/widget/navibar.cpp

@@ -31,8 +31,8 @@
 using namespace std;
 
 
-CNaviBar::CNaviBar(	const int& x,
+CNaviBar::CNaviBar(	const int& x_pos,
-			const int& y,
+			const int& y_pos,
 			const int& dx,
 			const int& dy,
 			CComponentsForm* parent,
@@ -40,7 +40,7 @@ CNaviBar::CNaviBar(	const int& x,
 			fb_pixel_t& color_frame,
 			fb_pixel_t& color_body,
 			fb_pixel_t& color_shadow)
-			: CComponentsFrmChain(	x, y, dx, dy,
+			: CComponentsFrmChain(	x_pos, y_pos, dx, dy,
 						NULL,
 						CC_DIR_X,
 						parent,

src/gui/widget/navibar.h

@@ -53,9 +53,9 @@ class CNaviBar : public CComponentsFrmChain
 
 	public:
 		/**CNaviBar Constructor
-		* @param[in]	x
+		* @param[in]	x_pos
 		* 	@li 	expects type int, x position
-		* @param[in]	y
+		* @param[in]	y_ypos
 		* 	@li 	expects type int, y position
 		* @param[in]	dx
 		* 	@li 	expects type int, width
@@ -74,8 +74,8 @@ class CNaviBar : public CComponentsFrmChain
 		*
 		* 	@see	class CComponentsFrmChain()
 		*/
-		CNaviBar(	const int& x,
+		CNaviBar(	const int& x_pos,
-				const int& y,
+				const int& y_pos,
 				const int& dx,
 				const int& dy,
 				CComponentsForm* parent = NULL,

src/system/settings.h

@@ -590,6 +590,13 @@ struct SNeutrinoSettings
 	int window_height;
 	int eventlist_additional;
 	int eventlist_epgplus;
+
+	enum CHANNELLIST_ADDITIONAL_MODES
+	{
+		CHANNELLIST_ADDITIONAL_MODE_OFF		= 0,
+		CHANNELLIST_ADDITIONAL_MODE_EPG 	= 1,
+		CHANNELLIST_ADDITIONAL_MODE_MINITV	= 2
+	};
 	int channellist_additional;
 	int channellist_epgtext_align_right;
 	int channellist_foot;