mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-12 07:53:37 +02:00
fix CST build
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:
@@ -282,8 +282,10 @@ CNeutrinoApp::CNeutrinoApp()
|
|||||||
blank_screen = false; //NI
|
blank_screen = false; //NI
|
||||||
|
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
|
#if !HAVE_CST_HARDWARE
|
||||||
avinput_pip = false;
|
avinput_pip = false;
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------------------
|
/*-------------------------------------------------------------------------------------
|
||||||
@@ -3426,6 +3428,7 @@ void CNeutrinoApp::RealRun()
|
|||||||
StartPip(CZapit::getInstance()->GetCurrentChannelID());
|
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))) {
|
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();
|
int boxmode = getBoxMode();
|
||||||
if (boxmode > -1 && boxmode != 12)
|
if (boxmode > -1 && boxmode != 12)
|
||||||
@@ -3441,6 +3444,7 @@ void CNeutrinoApp::RealRun()
|
|||||||
StopAVInputPiP();
|
StopAVInputPiP();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
else if (msg == (neutrino_msg_t) g_settings.key_pip_setup) {
|
else if (msg == (neutrino_msg_t) g_settings.key_pip_setup) {
|
||||||
CPipSetup pipsetup;
|
CPipSetup pipsetup;
|
||||||
pipsetup.exec(NULL, "");
|
pipsetup.exec(NULL, "");
|
||||||
@@ -4847,6 +4851,7 @@ void CNeutrinoApp::AVInputMode(bool bOnOff)
|
|||||||
{
|
{
|
||||||
//printf( (bOnOff) ? "mode: avinput on\n" : "mode: avinput off\n" );
|
//printf( (bOnOff) ? "mode: avinput on\n" : "mode: avinput off\n" );
|
||||||
|
|
||||||
|
#if !HAVE_CST_HARDWARE
|
||||||
if (bOnOff) {
|
if (bOnOff) {
|
||||||
// AVInput AN
|
// AVInput AN
|
||||||
frameBuffer->useBackground(false);
|
frameBuffer->useBackground(false);
|
||||||
@@ -4882,6 +4887,9 @@ void CNeutrinoApp::AVInputMode(bool bOnOff)
|
|||||||
cGLCD::AVInputMode(false);
|
cGLCD::AVInputMode(false);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
(void)bOnOff; // avoid compiler warning
|
||||||
|
#endif // !HAVE_CST_HARDWARE
|
||||||
}
|
}
|
||||||
|
|
||||||
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
||||||
@@ -5156,6 +5164,7 @@ void CNeutrinoApp::switchTvRadioMode(const int prev_mode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
|
#if !HAVE_CST_HARDWARE
|
||||||
void CNeutrinoApp::StartAVInputPiP() {
|
void CNeutrinoApp::StartAVInputPiP() {
|
||||||
if (!pipDemux) {
|
if (!pipDemux) {
|
||||||
pipDemux = new cDemux(1);
|
pipDemux = new cDemux(1);
|
||||||
@@ -5182,6 +5191,7 @@ void CNeutrinoApp::StopAVInputPiP() {
|
|||||||
avinput_pip = false;
|
avinput_pip = false;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/**************************************************************************************
|
/**************************************************************************************
|
||||||
* CNeutrinoApp - exec, menuitem callback (shutdown) *
|
* CNeutrinoApp - exec, menuitem callback (shutdown) *
|
||||||
@@ -5236,6 +5246,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
|
#if !HAVE_CST_HARDWARE
|
||||||
else if (actionKey=="avinput_pip") {
|
else if (actionKey=="avinput_pip") {
|
||||||
if (CZapit::getInstance()->GetPipChannelID())
|
if (CZapit::getInstance()->GetPipChannelID())
|
||||||
CZapit::getInstance()->StopPip();
|
CZapit::getInstance()->StopPip();
|
||||||
@@ -5247,6 +5258,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
|
|||||||
|
|
||||||
returnval = menu_return::RETURN_EXIT_ALL;
|
returnval = menu_return::RETURN_EXIT_ALL;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
else if (actionKey=="savesettings") {
|
else if (actionKey=="savesettings") {
|
||||||
|
@@ -171,9 +171,11 @@ public:
|
|||||||
int run(int argc, char **argv);
|
int run(int argc, char **argv);
|
||||||
|
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
|
#if !HAVE_CST_HARDWARE
|
||||||
bool avinput_pip;
|
bool avinput_pip;
|
||||||
void StartAVInputPiP();
|
void StartAVInputPiP();
|
||||||
void StopAVInputPiP();
|
void StopAVInputPiP();
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//callback stuff only....
|
//callback stuff only....
|
||||||
|
@@ -667,9 +667,11 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
|
|||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
bool CZapit::StopPip()
|
bool CZapit::StopPip()
|
||||||
{
|
{
|
||||||
|
#if !HAVE_CST_HARDWARE
|
||||||
if (CNeutrinoApp::getInstance()->avinput_pip) {
|
if (CNeutrinoApp::getInstance()->avinput_pip) {
|
||||||
CNeutrinoApp::getInstance()->StopAVInputPiP();
|
CNeutrinoApp::getInstance()->StopAVInputPiP();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (pip_channel_id) {
|
if (pip_channel_id) {
|
||||||
INFO("[pip] stop %llx", pip_channel_id);
|
INFO("[pip] stop %llx", pip_channel_id);
|
||||||
|
Reference in New Issue
Block a user