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 locks ?!?
[enigma2.git]
/
lib
/
dvb
/
db.cpp
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index eb0221a3ee4616b6898c974c6f4d8107caa901d4..dd942490e56c78cb64b252a27bbe91f1124f3f45 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)
@@
-168,7
+168,7
@@
RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &
return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
}
return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
}
-
bool
eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+
int
eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
{
ePtr<eDVBResourceManager> res_mgr;
if ( eDVBResourceManager::getInstance( res_mgr ) )
{
ePtr<eDVBResourceManager> res_mgr;
if ( eDVBResourceManager::getInstance( res_mgr ) )
@@
-180,7
+180,7
@@
bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReferen
((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
return res_mgr->canAllocateChannel(chid, chid_ignore);
}
((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
return res_mgr->canAllocateChannel(chid, chid_ignore);
}
- return
false
;
+ return
0
;
}
int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
}
int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
@@
-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 )