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

neutrino/channellist: avoid double code

Browse Source 
Origin commit data
------------------
Commit: 08f150e54d
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-03-14 (Sun, 14 Mar 2021)

Origin message was:
------------------
- neutrino/channellist: avoid double code
This commit is contained in:
vanhofen
2021-03-14 10:08:27 +01:00
parent 96ed703789
commit 42d1457417
2 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/gui/channellist.cpp
View File

@@ -926,41 +926,32 @@ int CChannelList::show()
#ifdef ENABLE_PIP
else if (!empty && ((msg == CRCInput::RC_play) || (msg == CRCInput::RC_playpause) || (msg == (neutrino_msg_t) g_settings.key_pip_close))) {
#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7
bool bm12=false;
FILE *f = fopen("/proc/cmdline", "r");
if (f) {
char buf[256] = "";
while(fgets(buf, sizeof(buf), f) != NULL) {
if (strstr(buf, "boxmode=12") != NULL) {
bm12=true;
}
}
fclose(f);
}
if (!bm12) {
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_BOXMODE12_NOT_ACTIVATED, CMsgBox::mbrOk, CMsgBox::mbOk, NEUTRINO_ICON_ERROR);
} else {
if(SameTP()) {
if (CZapit::getInstance()->GetPipChannelID() == (*chanlist)[selected]->getChannelID()) {
g_Zapit->stopPip();
calcSize();
paintBody();
} else {
handleMsg(NeutrinoMessages::EVT_PROGRAMLOCKSTATUS, 0x100, true);
}
bool bm12=false;
FILE *f = fopen("/proc/cmdline", "r");
if (f) {
char buf[256] = "";
while(fgets(buf, sizeof(buf), f) != NULL) {
if (strstr(buf, "boxmode=12") != NULL) {
bm12=true;
}
}
#else
if(SameTP()) {
if (CZapit::getInstance()->GetPipChannelID() == (*chanlist)[selected]->getChannelID()) {
g_Zapit->stopPip();
calcSize();
paintBody();
} else {
handleMsg(NeutrinoMessages::EVT_PROGRAMLOCKSTATUS, 0x100, true);
fclose(f);
}
if (!bm12)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_BOXMODE12_NOT_ACTIVATED, CMsgBox::mbrOk, CMsgBox::mbOk, NEUTRINO_ICON_ERROR);
else
#endif
{
if(SameTP()) {
if (CZapit::getInstance()->GetPipChannelID() == (*chanlist)[selected]->getChannelID()) {
g_Zapit->stopPip();
calcSize();
paintBody();
} else {
handleMsg(NeutrinoMessages::EVT_PROGRAMLOCKSTATUS, 0x100, true);
}
}
}
#endif
}
#endif
else if (!empty && ((msg == CRCInput::RC_info) || (msg == CRCInput::RC_help))) {

13
src/neutrino.cpp
View File

@@ -3367,22 +3367,17 @@ void CNeutrinoApp::RealRun()
}
fclose(f);
}
if (!bm12) {
if (!bm12)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_BOXMODE12_NOT_ACTIVATED, CMsgBox::mbrOk, CMsgBox::mbOk, NEUTRINO_ICON_ERROR);
} else {
else
#endif
{
t_channel_id pip_channel_id = CZapit::getInstance()->GetPipChannelID();
if (pip_channel_id)
g_Zapit->stopPip();
else
StartPip(CZapit::getInstance()->GetCurrentChannelID());
}
#else
t_channel_id pip_channel_id = CZapit::getInstance()->GetPipChannelID();
if (pip_channel_id)
g_Zapit->stopPip();
else
StartPip(CZapit::getInstance()->GetCurrentChannelID());
#endif
}
else if (msg == (neutrino_msg_t) g_settings.key_pip_setup) {
CPipSetup pipsetup;