mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- configure: depending --enable-quadpip on --enable-pip

Browse Source 
* unify ENABLE_PIP defines
* simplify ENABLE_QUADPIP defines

 Conflicts:
	src/gui/infoviewer.cpp
	src/gui/videosettings.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-10-16 22:08:35 +02:00
committed by Thilo Graf
parent f58fc736fe
commit 76735f088b
16 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/channellist.cpp
View File

@@ -922,7 +922,7 @@ int CChannelList::show()
{
moveChannelToBouquet();
}
#ifdef ENABLE_PIP
#if ENABLE_PIP
else if (!empty && ((msg == CRCInput::RC_play) || (msg == CRCInput::RC_playpause) || (msg == (neutrino_msg_t) g_settings.key_pip_close))) {
int boxmode = getBoxMode();
if (boxmode > -1 && boxmode != 12)
@@ -1125,7 +1125,7 @@ bool CChannelList::checkLockStatus(neutrino_msg_data_t data, bool pip)
out:
if (startvideo) {
if(pip) {
#ifdef ENABLE_PIP
#if ENABLE_PIP
if (CNeutrinoApp::getInstance()->StartPip((*chanlist)[selected]->getChannelID())) {
calcSize();
paintBody();
@@ -1919,7 +1919,7 @@ void CChannelList::paintButtonBar(bool is_current)
}
if (i == 5) {
//manage pip button
#ifdef ENABLE_PIP
#if ENABLE_PIP
if (!is_current || IS_WEBCHAN(channel_id))
#endif
continue;
@@ -2035,7 +2035,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
//set pip icon
const char *pip_icon = NULL;
#ifdef ENABLE_PIP
#if ENABLE_PIP
if ((*chanlist)[curr]->getChannelID() == CZapit::getInstance()->GetPipChannelID())
pip_icon = NEUTRINO_ICON_MARKER_PIP;
#endif