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

zapit/src/bouquets.cpp: use INVALID_SAT_POSITION instead of -1

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d48b6c1f9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-13 (Thu, 13 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-03-13 14:35:31 +04:00
parent 13680b5c25
commit c6d6a8876b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ class CBouquetManager
void saveBouquets(void);
void saveUBouquets(void);
void saveBouquets(const CZapitClient::bouquetMode bouquetMode, const char * const providerName, t_satellite_position satellitePosition = -1);
void saveBouquets(const CZapitClient::bouquetMode bouquetMode, const char * const providerName, t_satellite_position satellitePosition = INVALID_SAT_POSITION);
void loadBouquets(bool ignoreBouquetFile = false);
void renumServices();

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

@@ -283,7 +283,7 @@ void CBouquetManager::saveBouquets(const CZapitClient::bouquetMode bouquetMode,
{
if (bouquetMode == CZapitClient::BM_DELETEBOUQUETS) {
INFO("removing existing bouquets");
if (satellitePosition > 0) {
if (satellitePosition != INVALID_SAT_POSITION) {
if (CFEManager::getInstance()->cableOnly())
g_bouquetManager->clearAll(false);
else
@@ -420,7 +420,7 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser)
if(!bUser) {
/* set satellite position for provider bouquets.
reset position to 0, if position not match - means mixed bouquet */
if (newBouquet->satellitePosition < 0)
if (newBouquet->satellitePosition == INVALID_SAT_POSITION)
newBouquet->satellitePosition = satellitePosition;
else if (newBouquet->satellitePosition != satellitePosition)
newBouquet->satellitePosition = 0;
@@ -515,7 +515,7 @@ CZapitBouquet* CBouquetManager::addBouquet(const std::string & name, bool ub, bo
newBouquet->bUser = ub;
newBouquet->bFav = myfav;
newBouquet->bOther = false;
newBouquet->satellitePosition = -1;
newBouquet->satellitePosition = INVALID_SAT_POSITION;
//printf("CBouquetManager::addBouquet: %s, user %s\n", name.c_str(), ub ? "YES" : "NO");
if(ub) {
@@ -681,7 +681,7 @@ void CBouquetManager::deletePosition(t_satellite_position satellitePosition)
BouquetList tmplist;
for (unsigned int i =0; i < Bouquets.size(); i++) {
if (satellitePosition == Bouquets[i]->satellitePosition) {
printf("CBouquetManager::deletePosition: delete [%s]\n", Bouquets[i]->Name.c_str());
printf("CBouquetManager::deletePosition: delete [%s]\n", Bouquets[i]->Name.c_str());
delete Bouquets[i];
} else
tmplist.push_back(Bouquets[i]);