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

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/upnpbrowser.cpp


Origin commit data
------------------
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)

src/gui/audioplayer.cpp

@@ -295,9 +295,6 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
 	m_LastMode = CNeutrinoApp::getInstance()->getMode();
 	CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_audio );
 
-	// Stop sectionsd
-	//NI g_Sectionsd->setPauseScanning(true);
-
 	//NI
 	printf("[audioplayer.cpp] wakeup_hdd(%s)\n", g_settings.network_nfs_audioplayerdir.c_str());
 	wakeup_hdd(g_settings.network_nfs_audioplayerdir.c_str(),true);
@@ -320,8 +317,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
 
 	//g_Zapit->unlockPlayBack();
 	CZapit::getInstance()->EnablePlayback(true);
-	// Start Sectionsd
+
-	//NI g_Sectionsd->setPauseScanning(false);
 	m_frameBuffer->stopFrame();
 	CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , m_LastMode );
 	g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );

src/gui/movieplayer.cpp

@@ -228,8 +228,6 @@ void CMoviePlayerGui::cutNeutrino()
 	CZapit::getInstance()->setMoviePlayer(true);// let CCamManager::SetMode know, the call is from MoviePlayer
 
 	g_Zapit->lockPlayBack();
-	//NI if (!isWebTV)
-	//NI	g_Sectionsd->setPauseScanning(true);
 
 	m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/);
 	if (isWebTV)
@@ -252,7 +250,6 @@ void CMoviePlayerGui::restoreNeutrino()
 
 	//g_Zapit->unlockPlayBack();
 	CZapit::getInstance()->EnablePlayback(true);
-	//NI g_Sectionsd->setPauseScanning(false);
 
 	printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout);
 #if 0

src/gui/pictureviewer.cpp

@@ -202,9 +202,6 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
 
 		// blank background screen
 		videoDecoder->setBlank(true);
-
-		// Stop Sectionsd
-		//NI g_Sectionsd->setPauseScanning(true);
 	}
 
 	// Save and Clear background
@@ -226,9 +223,6 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
 	if (!audioplayer) { // !!! why? !!!
 		//g_Zapit->unlockPlayBack();
 		CZapit::getInstance()->EnablePlayback(true);
-
-		// Start Sectionsd
-		//NI g_Sectionsd->setPauseScanning(false);
 	}
 
 	// Restore previous background

src/gui/upnpbrowser.cpp

@@ -187,9 +187,6 @@ int CUpnpBrowserGui::exec(CMenuTarget* parent, const std::string & /*actionKey*/
 	// remember last mode
 	m_LastMode=(CNeutrinoApp::getInstance()->getLastMode());
 
-	// Stop sectionsd
-	//NI g_Sectionsd->setPauseScanning(true);
-
 	m_deviceliststart=0;
 	m_selecteddevice=0;
 	timeout = 0;
@@ -198,8 +195,6 @@ int CUpnpBrowserGui::exec(CMenuTarget* parent, const std::string & /*actionKey*/
 
 	stopAudio();
 
-	// Start Sectionsd
-	//NI g_Sectionsd->setPauseScanning(false);
 	m_frameBuffer->stopFrame();
 	m_frameBuffer->Clear();
 

src/gui/widget/menue.cpp

@@ -637,6 +637,8 @@ void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widge
 	fbutton_width	= 0;
 	fbutton_height	= 0;
 	nextShortcut	= 1;
+	saveScreen_width = 0;
+	saveScreen_height = 0;
 }
 
 void CMenuWidget::move(int xoff, int yoff)
@@ -1409,17 +1411,18 @@ void CMenuWidget::saveScreen()
 		return;
 
 	delete[] background;
-
+	saveScreen_height = full_height+fbutton_height;
-	background = new fb_pixel_t [full_width * (full_height+fbutton_height)];
+	saveScreen_width = full_width;
+	background = new fb_pixel_t [saveScreen_height * saveScreen_width];
 	if(background)
-		frameBuffer->SaveScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height + fbutton_height, background);
+		frameBuffer->SaveScreen(x /*-ConnectLineBox_Width*/, y, full_width, saveScreen_height, background);
 }
 
 void CMenuWidget::restoreScreen()
 {
 	if(background) {
 		if(savescreen)
-			frameBuffer->RestoreScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height + fbutton_height, background);
+			frameBuffer->RestoreScreen(x /*-ConnectLineBox_Width*/, y, saveScreen_width, saveScreen_height, background);
 	}
 }
 
@@ -1429,6 +1432,8 @@ void CMenuWidget::enableSaveScreen(bool enable)
 	if (!enable && background) {
 		delete[] background;
 		background = NULL;
+		saveScreen_width = 0;
+		saveScreen_height = 0;
 	}
 }
 

src/gui/widget/menue.h

@@ -494,6 +494,8 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals
 		CComponentsInfoBox	*info_box;
 		int			hint_height;
 		CComponentsHeader 	*header;
+		unsigned int saveScreen_width ;
+		unsigned int saveScreen_height;
 	protected:
 		std::string		nameString;
 		neutrino_locale_t	name;