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

fix GENERIC build

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb8abb1365
Author: max_10 <max_10@gmx.de>
Date: 2021-05-16 (Sun, 16 May 2021)

Origin message was:
------------------
- fix GENERIC build

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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2021-05-16 23:00:31 +02:00
committed by vanhofen
parent f5e2e71a1d
commit 1161502c25
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neutrino.cpp
View File

@@ -282,7 +282,7 @@ CNeutrinoApp::CNeutrinoApp()
blank_screen = false; //NI blank_screen = false; //NI
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE #if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
avinput_pip = false; avinput_pip = false;
#endif #endif
#endif #endif
@@ -3428,7 +3428,7 @@ void CNeutrinoApp::RealRun()
StartPip(CZapit::getInstance()->GetCurrentChannelID()); StartPip(CZapit::getInstance()->GetCurrentChannelID());
} }
} }
#if !HAVE_CST_HARDWARE #if !HAVE_CST_HARDWARE && !HAVE_GENERIC_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)
@@ -4851,7 +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 !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
if (bOnOff) { if (bOnOff) {
// AVInput AN // AVInput AN
frameBuffer->useBackground(false); frameBuffer->useBackground(false);
@@ -4889,7 +4889,7 @@ void CNeutrinoApp::AVInputMode(bool bOnOff)
} }
#else #else
(void)bOnOff; // avoid compiler warning (void)bOnOff; // avoid compiler warning
#endif // !HAVE_CST_HARDWARE #endif // !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
} }
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
@@ -5164,7 +5164,7 @@ void CNeutrinoApp::switchTvRadioMode(const int prev_mode)
} }
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE #if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
void CNeutrinoApp::StartAVInputPiP() { void CNeutrinoApp::StartAVInputPiP() {
if (!pipDemux) { if (!pipDemux) {
pipDemux = new cDemux(1); pipDemux = new cDemux(1);
@@ -5246,7 +5246,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
} }
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE #if !HAVE_CST_HARDWARE && !HAVE_GENERIC_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();

2
src/neutrino.h
View File

@@ -171,7 +171,7 @@ public:
int run(int argc, char **argv); int run(int argc, char **argv);
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE #if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
bool avinput_pip; bool avinput_pip;
void StartAVInputPiP(); void StartAVInputPiP();
void StopAVInputPiP(); void StopAVInputPiP();

2
src/zapit/src/zapit.cpp
View File

@@ -667,7 +667,7 @@ 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 !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
if (CNeutrinoApp::getInstance()->avinput_pip) { if (CNeutrinoApp::getInstance()->avinput_pip) {
CNeutrinoApp::getInstance()->StopAVInputPiP(); CNeutrinoApp::getInstance()->StopAVInputPiP();
} }