{
eServiceReference tmp = *i;
std::string str = tmp.path;
- if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
- {
- unsigned int p1 = str.find("FROM BOUQUET \"");
- if (p1 == std::string::npos)
- {
- eDebug("doof... kaputt");
- continue;
- }
- str.erase(0, p1+14);
- p1 = str.find("\"");
- if (p1 == std::string::npos)
- {
- eDebug("doof2... kaputt");
- continue;
- }
- str.erase(p1);
- tmp.path=str;
- }
if ( fprintf(f, "#SERVICE %s\r\n", tmp.toString().c_str()) < 0 )
goto err;
if ( i->name.length() )
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 ) )
((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)
} else if (p == 'c')
{
int cid, val;
- sscanf(v.c_str(), "%02d%04x", &cid, &val);
+ sscanf(v.c_str(), "%02d%x", &cid, &val);
s->setCacheEntry((eDVBService::cacheID)cid,val);
} else if (p == 'C')
{
break;
if (line[0]=='#')
{
- if (!strncmp(line, "#SERVICE ", 9) || !strncmp(line, "#SERVICE: ", 10))
+ if (!strncmp(line, "#SERVICE", 8))
{
int offs = line[8] == ':' ? 10 : 9;
eServiceReference tmp(line+offs);
eDebug("only DVB Bouquets supported");
continue;
}
- if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+ if ( tmp.flags&eServiceReference::canDescent )
{
unsigned int pos = tmp.path.rfind('/');
+ char buf[256];
+ std::string path = tmp.path;
if ( pos != std::string::npos )
- tmp.path.erase(0, pos+1);
- if (tmp.path.empty())
+ path.erase(0, pos+1);
+ if (path.empty())
{
eDebug("Bouquet load failed.. no filename given..");
continue;
}
- loadBouquet(tmp.path.c_str());
- char buf[256];
- snprintf(buf, 256, "(type == %d) FROM BOUQUET \"%s\" ORDER BY bouquet", tmp.data[0], tmp.path.c_str());
- tmp.path = buf;
+ pos = path.find("FROM BOUQUET ");
+ if (pos != std::string::npos)
+ {
+ char endchr = path[pos+13];
+ if (endchr != '"')
+ {
+ eDebug("ignore invalid bouquet '%s' (only \" are allowed)",
+ tmp.toString().c_str());
+ continue;
+ }
+ char *beg = &path[pos+14];
+ char *end = strchr(beg, endchr);
+ path.assign(beg, end - beg);
+ }
+ else
+ {
+ snprintf(buf, 256, "FROM BOUQUET \"%s\" ORDER BY bouquet", path.c_str());
+ tmp.path = buf;
+ }
+ loadBouquet(path.c_str());
}
list.push_back(tmp);
e = &list.back();
read_descr=true;
++entries;
}
- else if (read_descr && !strncmp(line, "#DESCRIPTION ", 13))
+ else if (read_descr && !strncmp(line, "#DESCRIPTION", 12))
{
- e->name = line+13;
+ int offs = line[12] == ':' ? 14 : 13;
+ e->name = line+offs;
read_descr=false;
}
else if (!strncmp(line, "#NAME ", 6))
ref.type=1;
ref.flags=7;
ref.data[0]=1;
- ref.path="(type == 1) FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
+ ref.path="FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
eBouquet &parent = m_bouquets["bouquets.tv"];
parent.m_services.push_back(ref);
parent.flushChanges();
ref.type=1;
ref.flags=7;
ref.data[0]=2;
- ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
+ ref.path="FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
eBouquet &parent = m_bouquets["bouquets.radio"];
parent.m_services.push_back(ref);
parent.flushChanges();
bool remove=true;
int system;
it->second.m_frontendParameters->getSystem(system);
- if ( orbpos != 0xFFFFFFFF && system == iDVBFrontend::feSatellite )
+ if ( system == iDVBFrontend::feSatellite )
{
eDVBFrontendParametersSatellite sat;
it->second.m_frontendParameters->getDVBS(sat);
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 )
eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
:eDVBDBListQuery(db, source, query)
{
+ std::set<unsigned int> found;
for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
it != m_db->m_services.end(); ++it)
{
if (res)
{
unsigned int dvbnamespace = it->first.getDVBNamespace().get()&0xFFFF0000;
- bool found=0;
- for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
- if ( (i->getDVBNamespace().get()&0xFFFF0000) == dvbnamespace )
- {
- found=true;
- break;
- }
- if (!found)
+ if (found.find(dvbnamespace) == found.end())
{
+ found.insert(dvbnamespace);
eServiceReferenceDVB ref;
ref.setDVBNamespace(dvbnamespace);
ref.flags=eServiceReference::flagDirectory;
eDVBDBProvidersQuery::eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
:eDVBDBListQuery(db, source, query)
{
+ std::set<std::string> found;
for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
it != m_db->m_services.end(); ++it)
{
int res = it->second->checkFilter(it->first, *query);
if (res)
{
- bool found=0;
-
const char *provider_name = it->second->m_provider_name.length() ?
it->second->m_provider_name.c_str() :
"Unknown";
-
- for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
- if (i->name == provider_name)
- {
- found=true;
- break;
- }
- if (!found)
+ if (found.find(std::string(provider_name)) == found.end())
{
+ found.insert(std::string(provider_name));
eServiceReferenceDVB ref;
char buf[64];
ref.name=provider_name;
std::list<std::string>::const_iterator end_of_exp;
if (begin == end)
- {
- eDebug("empty expression!");
return 0;
- }
if (*begin == "(")
{
}
res->m_string = val;
- res->m_int = atoi(val.c_str());
-// res->m_channelid = eDVBChannelID(val);
-
+
+ if (res->m_type == eDVBChannelQuery::tChannelID)
+ {
+ int ns, tsid, onid;
+ if (sscanf(val.c_str(), "%08x%04x%04x", &ns, &tsid, &onid) == 3)
+ res->m_channelid = eDVBChannelID(eDVBNamespace(ns), eTransportStreamID(tsid), eOriginalNetworkID(onid));
+ else
+ eDebug("couldn't parse channelid !! format should be hex NNNNNNNNTTTTOOOO (namespace, tsid, onid)");
+ }
+ else
+ res->m_int = atoi(val.c_str());
+
return 0;
}
git.cweiske.de / enigma2.git / blobdiff