diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7b9d59b88..d020f6539 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -278,8 +278,10 @@ CNeutrinoApp::CNeutrinoApp() #ifdef ENABLE_PIP +#if !HAVE_CST_HARDWARE avinput_pip = false; #endif +#endif } /*------------------------------------------------------------------------------------- @@ -3356,6 +3358,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) @@ -3371,6 +3374,7 @@ void CNeutrinoApp::RealRun() StopAVInputPiP(); } } +#endif else if (msg == (neutrino_msg_t) g_settings.key_pip_setup) { CPipSetup pipsetup; pipsetup.exec(NULL, ""); @@ -4762,6 +4766,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); @@ -4797,6 +4802,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 ) @@ -5057,6 +5065,7 @@ void CNeutrinoApp::switchTvRadioMode(const int prev_mode) } #ifdef ENABLE_PIP +#if !HAVE_CST_HARDWARE void CNeutrinoApp::StartAVInputPiP() { if (!pipDemux) { pipDemux = new cDemux(1); @@ -5083,6 +5092,7 @@ void CNeutrinoApp::StopAVInputPiP() { avinput_pip = false; } #endif +#endif /************************************************************************************** * CNeutrinoApp - exec, menuitem callback (shutdown) * @@ -5137,6 +5147,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(); @@ -5148,6 +5159,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) returnval = menu_return::RETURN_EXIT_ALL; } +#endif #endif else if (actionKey=="savesettings") { diff --git a/src/neutrino.h b/src/neutrino.h index f2a775040..83c2c9a28 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -170,9 +170,11 @@ public: int run(int argc, char **argv); #ifdef ENABLE_PIP +#if !HAVE_CST_HARDWARE bool avinput_pip; void StartAVInputPiP(); void StopAVInputPiP(); +#endif #endif //callback stuff only.... diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index c8fe75bb7..ad5cbb5e2 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -667,9 +667,11 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay #ifdef ENABLE_PIP bool CZapit::StopPip() { +#if !HAVE_CST_HARDWARE if (CNeutrinoApp::getInstance()->avinput_pip) { CNeutrinoApp::getInstance()->StopAVInputPiP(); } +#endif if (pip_channel_id) { INFO("[pip] stop %llx", pip_channel_id);