From 90b9469e3b2d2c9f50a9aee9a0b691d9677e6b13 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 13 Mar 2014 16:06:46 +0400 Subject: [PATCH] neutrino.cpp: set satellite position for generated satellite bouquets --- src/neutrino.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index df548abe1..c0a56ba7e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1384,6 +1384,7 @@ void CNeutrinoApp::channelsInit(bool bOnly) tvi = 0, ri = 0; CBouquet* tmp1 = TVsatList->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++) { if ((*it)->getServiceType() == ST_DIGITAL_TELEVISION_SERVICE) { @@ -1395,7 +1396,7 @@ void CNeutrinoApp::channelsInit(bool bOnly) 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) TVsatList->deleteBouquet(tmp1); if(!ri) @@ -2427,9 +2428,9 @@ _show: nNewChannel = bouquetList->exec(true); } _repeat: - CVFD::getInstance ()->showServicename(channelList->getActiveChannelName()); - CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); 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 /* FIXME if mode was changed while browsing, * other modes selected bouquet not restored */