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

gui/channellist.cpp: disable virtual bouquet edit,

Browse Source 
split handleMsg and pincode check code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14dbe516d3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-11-03 (Tue, 03 Nov 2015)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2015-11-03 18:47:29 +03:00
parent 276b9f085d
commit 947e362ec9
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/channellist.cpp
View File

@@ -315,7 +315,7 @@ int CChannelList::doChannelMenu(void)
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select); CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
bool empty = (*chanlist).empty(); bool empty = (*chanlist).empty();
bool allow_edit = (bouquet && bouquet->zapitBouquet && !bouquet->zapitBouquet->bOther); bool allow_edit = (bouquet && bouquet->zapitBouquet && !bouquet->zapitBouquet->bOther && !bouquet->zapitBouquet->bVirtual);
int i = 0; int i = 0;
snprintf(cnt, sizeof(cnt), "%d", i); snprintf(cnt, sizeof(cnt), "%d", i);
@@ -988,13 +988,17 @@ bool CChannelList::showInfo(int number, int epgpos)
int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data, bool pip) int CChannelList::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data, bool pip)
{ {
bool startvideo = true;
if (msg != NeutrinoMessages::EVT_PROGRAMLOCKSTATUS) // right now the only message handled here. if (msg != NeutrinoMessages::EVT_PROGRAMLOCKSTATUS) // right now the only message handled here.
return messages_return::unhandled; return messages_return::unhandled;
checkLockStatus(data, pip);
return messages_return::handled;
}
bool CChannelList::checkLockStatus(neutrino_msg_data_t data, bool pip)
{
bool startvideo = true;
//printf("===> program-lock-status: %d zp: %d\n", data, zapProtection != NULL); //printf("===> program-lock-status: %d zp: %d\n", data, zapProtection != NULL);
if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_NEVER) if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_NEVER)
goto out; goto out;
@@ -1079,9 +1083,9 @@ out:
} }
} else } else
g_RemoteControl->startvideo(); g_RemoteControl->startvideo();
return true;
} }
return false;
return messages_return::handled;
} }
bool CChannelList::adjustToChannelID(const t_channel_id channel_id) bool CChannelList::adjustToChannelID(const t_channel_id channel_id)

1
src/gui/channellist.h
View File

@@ -242,5 +242,6 @@ public:
}; };
unsigned Size() { return (*chanlist).size(); } unsigned Size() { return (*chanlist).size(); }
ZapitChannelList &getChannels() { return channels; }; ZapitChannelList &getChannels() { return channels; };
bool checkLockStatus(neutrino_msg_data_t data, bool pip = false);
}; };
#endif #endif