git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some changes for service groups
[enigma2.git]
/
lib
/
dvb
/
db.cpp
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index 39a0d3eefa120ad69514ed9cfaacf85ab266705a..07546a393a01b7b83bd655f0964af43722316476 100644
(file)
--- a/
lib/dvb/db.cpp
+++ b/
lib/dvb/db.cpp
@@
-81,7
+81,7
@@
RESULT eBouquet::flushChanges()
{
eServiceReference tmp = *i;
std::string str = tmp.path;
{
eServiceReference tmp = *i;
std::string str = tmp.path;
- if (
(i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory
)
+ if (
i->flags&eServiceReference::canDescent
)
{
unsigned int p1 = str.find("FROM BOUQUET \"");
if (p1 == std::string::npos)
{
unsigned int p1 = str.find("FROM BOUQUET \"");
if (p1 == std::string::npos)
@@
-642,7
+642,7
@@
void eDVBDB::loadBouquet(const char *path)
eDebug("only DVB Bouquets supported");
continue;
}
eDebug("only DVB Bouquets supported");
continue;
}
- if (
(tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory
)
+ if (
tmp.flags&eServiceReference::canDescent
)
{
unsigned int pos = tmp.path.rfind('/');
if ( pos != std::string::npos )
{
unsigned int pos = tmp.path.rfind('/');
if ( pos != std::string::npos )
@@
-679,6
+679,8
@@
void eDVBDB::loadBouquet(const char *path)
void eDVBDB::reloadBouquets()
{
m_bouquets.clear();
void eDVBDB::reloadBouquets()
{
m_bouquets.clear();
+ loadBouquet("groups.tv");
+ loadBouquet("groups.radio");
loadBouquet("bouquets.tv");
loadBouquet("bouquets.radio");
// create default bouquets when missing
loadBouquet("bouquets.tv");
loadBouquet("bouquets.radio");
// create default bouquets when missing