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

Remove global allchans, use CServiceManager and CZapit.

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1650 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-09-01 12:28:04 +00:00
parent 28382c9aa5
commit 0087dbc950
3 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -44,12 +44,10 @@
#include <gui/widget/buttons.h>
#include <zapit/client/zapitclient.h>
#include <zapit/channel.h>
#include <zapit/bouquets.h>
#include <zapit/zapit.h>
#include <zapit/getservices.h>
extern tallchans allchans;
extern CBouquetManager *g_bouquetManager;
void addChannelToBouquet(const unsigned int bouquet, const t_channel_id channel_id);
CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, unsigned int Bouquet, CZapitClient::channelsMode Mode)
:CListBox(Caption.c_str())
@@ -141,7 +139,7 @@ void CBEChannelSelectWidget::onOkKeyPressed()
if (isChannelInBouquet(selected))
g_bouquetManager->Bouquets[bouquet]->removeService(Channels[selected]->channel_id);
else
addChannelToBouquet( bouquet, Channels[selected]->channel_id);
CZapit::getInstance()->addChannelToBouquet( bouquet, Channels[selected]->channel_id);
bouquetChannels = mode == CZapitClient::MODE_TV ? &(g_bouquetManager->Bouquets[bouquet]->tvChannels) : &(g_bouquetManager->Bouquets[bouquet]->radioChannels);
@@ -165,13 +163,9 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & action
Channels.clear();
if (mode == CZapitClient::MODE_RADIO) {
for (tallchans_iterator it = allchans.begin(); it != allchans.end(); it++)
if (it->second.getServiceType() == ST_DIGITAL_RADIO_SOUND_SERVICE)
Channels.push_back(&(it->second));
CServiceManager::getInstance()->GetAllRadioChannels(Channels);
} else {
for (tallchans_iterator it = allchans.begin(); it != allchans.end(); it++)
if (it->second.getServiceType() == ST_DIGITAL_TELEVISION_SERVICE)
Channels.push_back(&(it->second));
CServiceManager::getInstance()->GetAllTvChannels(Channels);
}
sort(Channels.begin(), Channels.end(), CmpChannelByChName());