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

neutrino.cpp: set satellite position for generated satellite bouquets

Browse Source
This commit is contained in:
[CST] Focus
2014-03-13 16:06:46 +04:00
parent 90768b15ac
commit 90b9469e3b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/neutrino.cpp
View File

@@ -1384,6 +1384,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
tvi = 0, ri = 0; tvi = 0, ri = 0;
CBouquet* tmp1 = TVsatList->addBouquet(sit->second.name.c_str()); CBouquet* tmp1 = TVsatList->addBouquet(sit->second.name.c_str());
CBouquet* tmp2 = RADIOsatList->addBouquet(sit->second.name.c_str()); CBouquet* tmp2 = RADIOsatList->addBouquet(sit->second.name.c_str());
tmp1->satellitePosition = tmp2->satellitePosition = sit->first;
for(zapit_list_it_t it = zapitList.begin(); it != zapitList.end(); it++) { for(zapit_list_it_t it = zapitList.begin(); it != zapitList.end(); it++) {
if ((*it)->getServiceType() == ST_DIGITAL_TELEVISION_SERVICE) { if ((*it)->getServiceType() == ST_DIGITAL_TELEVISION_SERVICE) {
@@ -1395,7 +1396,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
ri++; ri++;
} }
} }
printf("[neutrino] created %s bouquet with %d TV and %d RADIO channels\n", sit->second.name.c_str(), tvi, ri); printf("[neutrino] created %s (%d) bouquet with %d TV and %d RADIO channels\n", sit->second.name.c_str(), sit->first, tvi, ri);
if(!tvi) if(!tvi)
TVsatList->deleteBouquet(tmp1); TVsatList->deleteBouquet(tmp1);
if(!ri) if(!ri)
@@ -2427,9 +2428,9 @@ _show:
nNewChannel = bouquetList->exec(true); nNewChannel = bouquetList->exec(true);
} }
_repeat: _repeat:
CVFD::getInstance ()->showServicename(channelList->getActiveChannelName());
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
printf("************************* ZAP RES: nNewChannel %d\n", nNewChannel);fflush(stdout); printf("************************* ZAP RES: nNewChannel %d\n", nNewChannel);fflush(stdout);
//CVFD::getInstance ()->showServicename(channelList->getActiveChannelName());
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
if(nNewChannel == -1) { // restore orig. bouquet and selected channel on cancel if(nNewChannel == -1) { // restore orig. bouquet and selected channel on cancel
/* FIXME if mode was changed while browsing, /* FIXME if mode was changed while browsing,
* other modes selected bouquet not restored */ * other modes selected bouquet not restored */