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

fix CST build

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6179e7966f
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-05-10 (Mon, 10 May 2021)

Origin message was:
------------------
- fix CST build

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-05-10 23:29:11 +02:00
parent cb94835a1a
commit b6597a3f7b
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neutrino.cpp
View File

@@ -282,8 +282,10 @@ CNeutrinoApp::CNeutrinoApp()
blank_screen = false; //NI
#ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE
avinput_pip = false;
#endif
#endif
}
/*-------------------------------------------------------------------------------------
@@ -3426,6 +3428,7 @@ void CNeutrinoApp::RealRun()
StartPip(CZapit::getInstance()->GetCurrentChannelID());
}
}
#if !HAVE_CST_HARDWARE
else if ((msg == (neutrino_msg_t) g_settings.key_pip_close_avinput) && ((g_info.hw_caps->has_SCART_input) || (g_info.hw_caps->has_HDMI_input))) {
int boxmode = getBoxMode();
if (boxmode > -1 && boxmode != 12)
@@ -3441,6 +3444,7 @@ void CNeutrinoApp::RealRun()
StopAVInputPiP();
}
}
#endif
else if (msg == (neutrino_msg_t) g_settings.key_pip_setup) {
CPipSetup pipsetup;
pipsetup.exec(NULL, "");
@@ -4847,6 +4851,7 @@ void CNeutrinoApp::AVInputMode(bool bOnOff)
{
//printf( (bOnOff) ? "mode: avinput on\n" : "mode: avinput off\n" );
#if !HAVE_CST_HARDWARE
if (bOnOff) {
// AVInput AN
frameBuffer->useBackground(false);
@@ -4882,6 +4887,9 @@ void CNeutrinoApp::AVInputMode(bool bOnOff)
cGLCD::AVInputMode(false);
#endif
}
#else
(void)bOnOff; // avoid compiler warning
#endif // !HAVE_CST_HARDWARE
}
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
@@ -5156,6 +5164,7 @@ void CNeutrinoApp::switchTvRadioMode(const int prev_mode)
}
#ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE
void CNeutrinoApp::StartAVInputPiP() {
if (!pipDemux) {
pipDemux = new cDemux(1);
@@ -5182,6 +5191,7 @@ void CNeutrinoApp::StopAVInputPiP() {
avinput_pip = false;
}
#endif
#endif
/**************************************************************************************
* CNeutrinoApp - exec, menuitem callback (shutdown) *
@@ -5236,6 +5246,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
}
#ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE
else if (actionKey=="avinput_pip") {
if (CZapit::getInstance()->GetPipChannelID())
CZapit::getInstance()->StopPip();
@@ -5247,6 +5258,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
returnval = menu_return::RETURN_EXIT_ALL;
}
#endif
#endif
else if (actionKey=="savesettings") {