mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++'

Browse Source 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-11 00:40:30 +01:00
parent 19000c33bd a3aa254535
commit fbee2df820
55 changed files with 1446 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/pictureviewer.cpp
View File

@@ -112,8 +112,12 @@ CPictureViewerGui::~CPictureViewerGui()
}
//------------------------------------------------------------------------
int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
{
audioplayer = false;
if (actionKey == "audio")
audioplayer = true;
selected = 0;
width = w_max (710, 0);
height = h_max (570, 0);
@@ -159,14 +163,16 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & /*actionKey
// remember last mode
m_LastMode=(CNeutrinoApp::getInstance()->getLastMode() | NeutrinoMessages::norezap);
//g_Zapit->setStandby(true);
g_Zapit->lockPlayBack();
if (!audioplayer) { // !!! why? !!!
//g_Zapit->setStandby(true);
g_Zapit->lockPlayBack();
// blank background screen
videoDecoder->setBlank(true);
// blank background screen
videoDecoder->setBlank(true);
// Stop Sectionsd
g_Sectionsd->setPauseScanning(true);
// Stop Sectionsd
g_Sectionsd->setPauseScanning(true);
}
// Save and Clear background
bool usedBackground = frameBuffer->getuseBackground();
@@ -180,11 +186,13 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & /*actionKey
// free picviewer mem
m_viewer->Cleanup();
//g_Zapit->setStandby(false);
g_Zapit->unlockPlayBack();
if (!audioplayer) { // !!! why? !!!
//g_Zapit->setStandby(false);
g_Zapit->unlockPlayBack();
// Start Sectionsd
g_Sectionsd->setPauseScanning(false);
// Start Sectionsd
g_Sectionsd->setPauseScanning(false);
}
// Restore previous background
if (usedBackground) {
@@ -227,6 +235,9 @@ int CPictureViewerGui::show()
frameBuffer->blit();
}
if (audioplayer)
m_audioPlayer->wantNextPlay();
if (m_state!=SLIDESHOW)
timeout=50; // egal
else