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

zapit/src/bouquets.cpp: fix webtv loading before ubouquets,

Browse Source 
do not save webtv 'bouquets' to bouquets.xml
This commit is contained in:
[CST] Focus
2015-05-18 16:06:47 +03:00
parent 4b999db6c8
commit 77116aa07b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zapit/include/zapit/bouquets.h
View File

@@ -44,12 +44,23 @@ class CZapitBouquet
bool bFav; bool bFav;
bool bOther; bool bOther;
int bScanEpg; int bScanEpg;
bool bVirtual; // dont save
t_satellite_position satellitePosition; t_satellite_position satellitePosition;
ZapitChannelList radioChannels; ZapitChannelList radioChannels;
ZapitChannelList tvChannels; ZapitChannelList tvChannels;
inline CZapitBouquet(const std::string name) { Name = name; BqID=DEFAULT_BQ_ID; bHidden = DEFAULT_BQ_HIDDEN; bLocked = DEFAULT_BQ_LOCKED; bUser = false; bOther = DEFAULT_BQ_OTHER; bScanEpg = DEFAULT_BQ_SCANEPG; } inline CZapitBouquet(const std::string name)
{
Name = name;
BqID=DEFAULT_BQ_ID;
bHidden = DEFAULT_BQ_HIDDEN;
bLocked = DEFAULT_BQ_LOCKED;
bUser = false;
bOther = DEFAULT_BQ_OTHER;
bScanEpg = DEFAULT_BQ_SCANEPG;
bVirtual = false;
}
void addService(CZapitChannel* newChannel); void addService(CZapitChannel* newChannel);

6
src/zapit/src/bouquets.cpp
View File

@@ -272,7 +272,7 @@ void CBouquetManager::saveBouquets(void)
for (unsigned int i = 0; i < Bouquets.size(); i++) { for (unsigned int i = 0; i < Bouquets.size(); i++) {
if (Bouquets[i] != remainChannels) { if (Bouquets[i] != remainChannels) {
DBG("save Bouquets: name %s user: %d\n", Bouquets[i]->Name.c_str(), Bouquets[i]->bUser); DBG("save Bouquets: name %s user: %d\n", Bouquets[i]->Name.c_str(), Bouquets[i]->bUser);
if(!Bouquets[i]->bUser) { if(!Bouquets[i]->bUser && !Bouquets[i]->bVirtual) {
writeBouquet(bouq_fd, i,false); writeBouquet(bouq_fd, i,false);
} }
} }
@@ -492,8 +492,8 @@ void CBouquetManager::loadBouquets(bool ignoreBouquetFile)
sortBouquets(); sortBouquets();
} }
parseBouquetsXml(UBOUQUETS_XML, true);
loadWebtv(); loadWebtv();
parseBouquetsXml(UBOUQUETS_XML, true);
renumServices(); renumServices();
TIMER_STOP("[zapit] bouquet loading took"); TIMER_STOP("[zapit] bouquet loading took");
} }
@@ -813,6 +813,7 @@ void CBouquetManager::loadWebtv()
if (!prov) if (!prov)
prov = "WebTV"; prov = "WebTV";
pbouquet = addBouquetIfNotExist(prov); pbouquet = addBouquetIfNotExist(prov);
pbouquet->bVirtual = true;
while ((xmlGetNextOccurence(l1, "webtv"))) { while ((xmlGetNextOccurence(l1, "webtv"))) {
const char *title = xmlGetAttribute(l1, "title"); const char *title = xmlGetAttribute(l1, "title");
@@ -824,6 +825,7 @@ void CBouquetManager::loadWebtv()
if (genre) { if (genre) {
std::string bname = prov ? std::string(std::string(prov) + " ") + genre : genre; std::string bname = prov ? std::string(std::string(prov) + " ") + genre : genre;
gbouquet = addBouquetIfNotExist(bname); gbouquet = addBouquetIfNotExist(bname);
gbouquet->bVirtual = true;
} }
if (title && url) { if (title && url) {
t_channel_id chid = create_channel_id64(0, 0, 0, 0, 0, url); t_channel_id chid = create_channel_id64(0, 0, 0, 0, 0, url);