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

Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)



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

src/driver/streamts.cpp

@@ -57,6 +57,7 @@
 #include <driver/record.h>
 #include <driver/genpsi.h>
 #include <system/set_threadname.h>
+
 #include <gui/movieplayer.h>
 #include <cs_api.h>
 

src/gui/audioplayer.cpp

@@ -37,7 +37,6 @@
 #include <driver/rcinput.h>
 #include <driver/audioplay.h>
 #include <driver/audiometadata.h>
-#include <driver/display.h>
 
 #include <daemonc/remotecontrol.h>
 

src/gui/epgplus.cpp

@@ -236,7 +236,7 @@ void EpgPlus::TimeLine::paintGrid()
 	for (int i = 0; i < numberOfTicks; ++i, xPos += tickDist)
 	{
 		// display a line for the tick
-		this->frameBuffer->paintVLineRel(xPos, this->y, this->font->getHeight(), COL_MENUCONTENTDARK_PLUS_0);
+		this->frameBuffer->paintVLineRel(xPos, this->y, this->font->getHeight(), COL_MENUCONTENT_TEXT);
 	}
 }
 
@@ -292,7 +292,7 @@ void EpgPlus::TimeLine::paintMark(time_t _startTime, int pduration, int px, int
 	if (separationLineThickness > 0)
 	{
 		this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight() + this->font->getHeight(),
-					this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
+					this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
 	}
 }
 
@@ -305,7 +305,7 @@ void EpgPlus::TimeLine::clearMark()
 	if (separationLineThickness > 0)
 	{
 		this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight() + this->font->getHeight(),
-					this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
+					this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
 	}
 }
 
@@ -365,11 +365,11 @@ void EpgPlus::ChannelEventEntry::paint(bool pisSelected, bool toggleColor)
 	{
 		// left side
 		this->frameBuffer->paintBoxRel(this->x, this->y,
-					this->separationLineThickness, this->font->getHeight(), COL_MENUCONTENTDARK_PLUS_0);
+					this->separationLineThickness, this->font->getHeight(), COL_MENUCONTENT_TEXT);
 
 		// bottom
 		this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight(),
-					this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
+					this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
 	}
 
 	if (pisSelected)
@@ -510,7 +510,7 @@ void EpgPlus::ChannelEntry::paint(bool isSelected, time_t _selectedTime)
 	if (separationLineThickness > 0)
 	{
 		this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight(),
-						this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
+						this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
 	}
 
 	bool toggleColor = false;
@@ -960,10 +960,12 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
 					loop = false;
 			}
 			else if (msg == CRCInput::RC_epg)
+#if 0
 			{
 				loop = false;
 			}
 			else if (msg == CRCInput::RC_help)
+#endif
 			{
 				//fprintf(stderr, "RC_help, bigfont = %d\n", bigfont);
 				hide();

src/neutrino.cpp

@@ -239,13 +239,13 @@ CNeutrinoApp::CNeutrinoApp()
 : configfile('\t')
 {
 	standby_pressed_at.tv_sec = 0;
-	osd_resolution_tmp        = -1;
-	frameBufferInitialized    = false;
 #if HAVE_TRIPLEDRAGON || USE_STB_HAL
 	/* this needs to happen before the framebuffer is set up */
 	init_td_api();
 	// shutdown_td_api();
 #endif
+	osd_resolution_tmp        = -1;
+	frameBufferInitialized    = false;
 
 	frameBuffer = CFrameBuffer::getInstance();
 	frameBuffer->setIconBasePath(ICONSDIR);
@@ -327,22 +327,6 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
 /**************************************************************************************
 *          CNeutrinoApp -  loadSetup, load the application-settings                   *
 **************************************************************************************/
-#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE
-#define DEFAULT_X_START_SD	32
-#define DEFAULT_Y_START_SD	26
-#define DEFAULT_X_END_SD	694
-#define DEFAULT_Y_END_SD	570
-#else
-#define DEFAULT_X_START_SD	60
-#define DEFAULT_Y_START_SD	20
-#define DEFAULT_X_END_SD	1220
-#define DEFAULT_Y_END_SD	560
-#endif
-
-#define DEFAULT_X_START_HD	40   //5
-#define DEFAULT_Y_START_HD	25   //5
-#define DEFAULT_X_END_HD	1235 //1275
-#define DEFAULT_Y_END_HD	690  //715
 
 std::string ttx_font_file = "";