diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index a417924be..b028e80c6 100644 --- a/src/gui/audioplayer.cpp +++ b/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 ); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 1872ad57a..917f11957 100644 --- a/src/gui/movieplayer.cpp +++ b/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 diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 4fe1c7a85..506d68fd1 100644 --- a/src/gui/pictureviewer.cpp +++ b/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 diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 7c0575fde..d3c9a1921 100644 --- a/src/gui/upnpbrowser.cpp +++ b/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(); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 78befb956..3277cc42d 100644 --- a/src/gui/widget/menue.cpp +++ b/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; - - background = new fb_pixel_t [full_width * (full_height+fbutton_height)]; + saveScreen_height = 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; } } diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index bc527ed68..61d6691b4 100644 --- a/src/gui/widget/menue.h +++ b/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;