git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug
[enigma2.git]
/
lib
/
dvb
/
db.cpp
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index cf65569081aa8bd125eda4686d4e58a754501687..bb29bcca9a19e36195f6c07528fc0bd97f091982 100644
(file)
--- a/
lib/dvb/db.cpp
+++ b/
lib/dvb/db.cpp
@@
-668,11
+668,8
@@
void eDVBDB::loadBouquet(const char *path)
e->name = line+offs;
read_descr=false;
}
e->name = line+offs;
read_descr=false;
}
- else if (!strncmp(line, "#NAME ", 6) || !strncmp(line, "#NAME: ", 7))
- {
- int offs = line[5] == ':' ? 7 : 6;
- bouquet.m_bouquet_name=line+offs;
- }
+ else if (!strncmp(line, "#NAME ", 6))
+ bouquet.m_bouquet_name=line+6;
continue;
}
}
continue;
}
}
@@
-774,6
+771,8
@@
RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
if ((unsigned int)sat.orbital_position != orbpos)
remove=false;
}
if ((unsigned int)sat.orbital_position != orbpos)
remove=false;
}
+ else if (orbpos != 0xFFFFFFFF) // do not remove -C or -T transponders when a orbital position is given..
+ remove=false;
if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
remove=false;
if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
remove=false;
if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )