mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- enable epg-scan while audioplayer, movieplayer, pictureviewer and

Browse Source 
upnp-browser runs
This commit is contained in:
svenhoefer
2016-11-24 21:41:23 +01:00
parent a8ea7c60d5
commit a5bc693282
4 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/audioplayer.cpp
View File

@@ -293,9 +293,6 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
m_LastMode = CNeutrinoApp::getInstance()->getMode(); m_LastMode = CNeutrinoApp::getInstance()->getMode();
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_audio ); CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_audio );
// Stop sectionsd
g_Sectionsd->setPauseScanning(true);
puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT "."); puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT ".");
if (my_system(AUDIOPLAYER_START_SCRIPT) != 0) if (my_system(AUDIOPLAYER_START_SCRIPT) != 0)
perror(AUDIOPLAYER_START_SCRIPT " failed"); perror(AUDIOPLAYER_START_SCRIPT " failed");
@@ -314,8 +311,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
//g_Zapit->unlockPlayBack(); //g_Zapit->unlockPlayBack();
CZapit::getInstance()->EnablePlayback(true); CZapit::getInstance()->EnablePlayback(true);
// Start Sectionsd
g_Sectionsd->setPauseScanning(false);
m_frameBuffer->stopFrame(); m_frameBuffer->stopFrame();
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , m_LastMode ); CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , m_LastMode );
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 ); g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );

3
src/gui/movieplayer.cpp
View File

@@ -221,8 +221,6 @@ void CMoviePlayerGui::cutNeutrino()
return; return;
g_Zapit->lockPlayBack(); g_Zapit->lockPlayBack();
if (!isWebTV)
g_Sectionsd->setPauseScanning(true);
m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/); m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/);
if (isWebTV) if (isWebTV)
@@ -245,7 +243,6 @@ void CMoviePlayerGui::restoreNeutrino()
//g_Zapit->unlockPlayBack(); //g_Zapit->unlockPlayBack();
CZapit::getInstance()->EnablePlayback(true); CZapit::getInstance()->EnablePlayback(true);
g_Sectionsd->setPauseScanning(false);
printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout); printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout);
#if 0 #if 0

6
src/gui/pictureviewer.cpp
View File

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

5
src/gui/upnpbrowser.cpp
View File

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