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

CControlAPI::SendChannelList: show only unique channellist & currenttpchannels

Browse Source
This commit is contained in:
Jacek Jendrzej
2013-10-01 17:55:18 +02:00
parent a94d9ea8f8
commit 9d7751dc8c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -1614,6 +1614,8 @@ void CControlAPI::SendEventList(CyhookHandler *hh, t_channel_id channel_id)
void CControlAPI::SendChannelList(CyhookHandler *hh, bool currentTP) void CControlAPI::SendChannelList(CyhookHandler *hh, bool currentTP)
{ {
t_channel_id current_channel = 0; t_channel_id current_channel = 0;
std::vector<t_channel_id> v;
if(currentTP){ if(currentTP){
current_channel = CZapit::getInstance()->GetCurrentChannelID(); current_channel = CZapit::getInstance()->GetCurrentChannelID();
current_channel=(current_channel>>16); current_channel=(current_channel>>16);
@@ -1625,6 +1627,12 @@ void CControlAPI::SendChannelList(CyhookHandler *hh, bool currentTP)
for (; !(cit.EndOfChannels()); cit++) { for (; !(cit.EndOfChannels()); cit++) {
CZapitChannel * channel = *cit; CZapitChannel * channel = *cit;
if(!currentTP || (channel->channel_id >>16) == current_channel){ if(!currentTP || (channel->channel_id >>16) == current_channel){
size_t pos = std::find(v.begin(), v.end(), channel->channel_id) - v.begin();
if( pos < v.size() )
continue;
v.push_back(channel->channel_id);
hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s\n", channel->channel_id, channel->getName().c_str()); hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s\n", channel->channel_id, channel->getName().c_str());
} }
} }