#include <errno.h>
#include <lib/dvb/db.h>
+#include <lib/dvb/dvb.h>
#include <lib/dvb/frontend.h>
+#include <lib/dvb/epgcache.h>
#include <lib/base/eerror.h>
#include <lib/base/estring.h>
#include <dvbsi++/service_description_section.h>
{
if ( pos < 0 || pos >= m_services.size() )
return -1;
+ ++pos;
list::iterator source=m_services.end();
list::iterator dest=m_services.end();
+ bool forward = false;
for (list::iterator it(m_services.begin()); it != m_services.end(); ++it)
{
- if (dest == m_services.end() && !pos--)
+ if (dest == m_services.end() && !--pos)
dest = it;
if (*it == ref)
+ {
source = it;
+ forward = pos>0;
+ }
if (dest != m_services.end() && source != m_services.end())
break;
}
if (dest == m_services.end() || source == m_services.end() || source == dest)
return -1;
- std::iter_swap(source,dest);
+ while (source != dest)
+ {
+ if (forward)
+ std::iter_swap(source++, source);
+ else
+ std::iter_swap(source--, source);
+ }
return 0;
}
RESULT eBouquet::flushChanges()
{
- FILE *f=fopen(m_path.c_str(), "wt");
+ FILE *f=fopen((CONFIGDIR"/enigma2/"+m_filename).c_str(), "w");
if (!f)
return -1;
if ( fprintf(f, "#NAME %s\r\n", m_bouquet_name.c_str()) < 0 )
return 0;
err:
fclose(f);
- eDebug("couldn't write file %s", m_path.c_str());
+ eDebug("couldn't write file %s", m_filename.c_str());
return -1;
}
+RESULT eBouquet::setListName(const std::string &name)
+{
+ m_bouquet_name = name;
+ return 0;
+}
+
eDVBService::eDVBService()
{
}
makeUpper(m_service_name_sort);
while ((!m_service_name_sort.empty()) && m_service_name_sort[0] == ' ')
m_service_name_sort.erase(0, 1);
-
+
/* put unnamed services at the end, not at the beginning. */
if (m_service_name_sort.empty())
m_service_name_sort = "\xFF";
RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
{
if (!ref.name.empty())
- name = ref.name;
+ name = ref.name; // use renamed service name..
else if (!m_service_name.empty())
name = m_service_name;
else
return 0;
}
-int eDVBService::getLength(const eServiceReference &ref)
+RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time)
{
- return -1;
+ return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
+}
+
+bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+{
+ ePtr<eDVBResourceManager> res_mgr;
+ if ( eDVBResourceManager::getInstance( res_mgr ) )
+ eDebug("isPlayble... no res manager!!");
+ else
+ {
+ eDVBChannelID chid, chid_ignore;
+ ((const eServiceReferenceDVB&)ref).getChannelID(chid);
+ ((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
+ return res_mgr->canAllocateChannel(chid, chid_ignore);
+ }
+ return false;
}
int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
void eDVBService::setCachePID(cacheID id, int pid)
{
- m_cache[id] = pid;
+ if (pid == -1)
+ m_cache.erase(id);
+ else
+ m_cache[id] = pid;
}
DEFINE_REF(eDVBDB);
/* THIS CODE IS BAD. it should be replaced by somethine better. */
-void eDVBDB::load()
+void eDVBDB::reloadServicelist()
{
eDebug("---- opening lame channel db");
- FILE *f=fopen("lamedb", "rt");
+ FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "rt");
if (!f)
+ {
+ struct stat s;
+ if ( !stat("lamedb", &s) )
+ {
+ rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
+ reloadServicelist();
+ }
return;
+ }
char line[256];
if ((!fgets(line, 256, f)) || strncmp(line, "eDVB services", 13))
{
sat.symbol_rate = symbol_rate;
sat.polarisation = polarisation;
sat.fec = fec;
- sat.orbital_position = orbital_position;
+ sat.orbital_position =
+ orbital_position < 0 ? orbital_position + 3600 : orbital_position;
sat.inversion = inversion;
feparm->setDVBS(sat);
} else if (line[1]=='t')
ter.guard_interval = guard_interval;
ter.hierarchy = hierarchy;
ter.inversion = inversion;
-
feparm->setDVBT(ter);
} else if (line[1]=='c')
{
- int frequency, symbol_rate, inversion=0, modulation=3;
- sscanf(line+2, "%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation);
-// t.setCable(frequency, symbol_rate, inversion, modulation);
+ eDVBFrontendParametersCable cab;
+ int frequency, symbol_rate,
+ inversion=eDVBFrontendParametersCable::Inversion::Unknown,
+ modulation=eDVBFrontendParametersCable::Modulation::Auto,
+ fec_inner=eDVBFrontendParametersCable::FEC::fAuto;
+ sscanf(line+2, "%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner);
+ cab.frequency = frequency;
+ cab.fec_inner = fec_inner;
+ cab.inversion = inversion;
+ cab.symbol_rate = symbol_rate;
+ cab.modulation = modulation;
+ feparm->setDVBC(cab);
}
}
addChannelToList(channelid, feparm);
s->m_service_name = line;
s->genSortName();
-
+
fgets(line, 256, f);
if (strlen(line))
line[strlen(line)-1]=0;
-
std::string str=line;
if (str[1]!=':') // old ... (only service_provider)
fclose(f);
}
-void eDVBDB::save()
+void eDVBDB::saveServicelist()
{
eDebug("---- saving lame channel db");
- FILE *f=fopen("lamedb", "wt");
+ FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "w");
int channels=0, services=0;
if (!f)
eFatal("couldn't save lame channel db!");
chid.transport_stream_id.get(), chid.original_network_id.get());
eDVBFrontendParametersSatellite sat;
eDVBFrontendParametersTerrestrial ter;
+ eDVBFrontendParametersCable cab;
if (!ch.m_frontendParameters->getDVBS(sat))
{
fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
sat.frequency, sat.symbol_rate,
- sat.polarisation, sat.fec, sat.orbital_position,
+ sat.polarisation, sat.fec,
+ sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position,
sat.inversion);
}
if (!ch.m_frontendParameters->getDVBT(ter))
ter.code_rate_LP, ter.modulation, ter.transmission_mode,
ter.guard_interval, ter.hierarchy, ter.inversion);
}
+ if (!ch.m_frontendParameters->getDVBC(cab))
+ {
+ fprintf(f, "\tc %d:%d:%d:%d:%d\n",
+ cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation, cab.fec_inner);
+ }
fprintf(f, "/\n");
channels++;
}
return;
}
eBouquet &bouquet = m_bouquets[bouquet_name];
- bouquet.m_path = path;
+ bouquet.m_filename = bouquet_name;
std::list<eServiceReference> &list = bouquet.m_services;
list.clear();
- eDebug("loading bouquet... %s", path);
- FILE *fp=fopen(path, "rt");
+ std::string p = CONFIGDIR"/enigma2/";
+ p+=path;
+ eDebug("loading bouquet... %s", p.c_str());
+ FILE *fp=fopen(p.c_str(), "rt");
int entries=0;
if (!fp)
{
+ struct stat s;
+ if ( !stat(path, &s) )
+ {
+ rename(path, p.c_str() );
+ loadBouquet(path);
+ return;
+ }
eDebug("failed to open.");
if ( strstr(path, "bouquets.tv") )
{
}
if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
{
- std::string str = tmp.path;
- unsigned int pos = str.rfind('/');
+ unsigned int pos = tmp.path.rfind('/');
if ( pos != std::string::npos )
- str.erase(0, pos+1);
- if (str.empty())
+ tmp.path.erase(0, pos+1);
+ if (tmp.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], str.c_str());
+ snprintf(buf, 256, "(type == %d) FROM BOUQUET \"%s\" ORDER BY bouquet", tmp.data[0], tmp.path.c_str());
tmp.path = buf;
}
list.push_back(tmp);
eDebug("%d entries in Bouquet %s", entries, bouquet_name.c_str());
}
-void eDVBDB::saveBouquet(const char *path)
-{
-
-}
-
-void eDVBDB::loadBouquets()
+void eDVBDB::reloadBouquets()
{
+ m_bouquets.clear();
loadBouquet("bouquets.tv");
loadBouquet("bouquets.radio");
// create default bouquets when missing
if ( m_bouquets.find("userbouquet.favourites.tv") == m_bouquets.end() )
{
eBouquet &b = m_bouquets["userbouquet.favourites.tv"];
- b.m_path = "userbouquet.favourites.tv";
+ b.m_filename = "userbouquet.favourites.tv";
b.m_bouquet_name = "Favourites (TV)";
b.flushChanges();
eServiceReference ref;
if ( m_bouquets.find("userbouquet.favourites.radio") == m_bouquets.end() )
{
eBouquet &b = m_bouquets["userbouquet.favourites.radio"];
- b.m_path = "userbouquet.favourites.radio";
+ b.m_filename = "userbouquet.favourites.radio";
b.m_bouquet_name = "Favourites (Radio)";
b.flushChanges();
eServiceReference ref;
memset(ref.data, 0, sizeof(ref.data));
ref.type=1;
ref.flags=7;
- ref.data[0]=1;
+ ref.data[0]=2;
ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
eBouquet &parent = m_bouquets["bouquets.radio"];
parent.m_services.push_back(ref);
}
}
-void eDVBDB::saveBouquets()
-{
-
-}
+eDVBDB *eDVBDB::instance;
eDVBDB::eDVBDB()
{
- load();
- loadBouquets();
+ instance = this;
+ reloadServicelist();
}
eDVBDB::~eDVBDB()
{
-// save();
+ instance=NULL;
}
RESULT eDVBDB::addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)
RESULT eDVBDB::flush()
{
- save();
+ saveServicelist();
return 0;
}
RESULT eDVBDB::startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q, const eServiceReference &source)
{
- if ( q && q->m_bouquet_name.length() )
- query = new eDVBDBBouquetQuery(this, source, q);
+ if ( source.path.find("FROM") != std::string::npos )
+ {
+ if ( source.path.find("BOUQUET") != std::string::npos )
+ query = new eDVBDBBouquetQuery(this, source, q);
+ else if ( source.path.find("SATELLITES") != std::string::npos )
+ query = new eDVBDBSatellitesQuery(this, source, q);
+ else if ( source.path.find("PROVIDERS") != std::string::npos )
+ query = new eDVBDBProvidersQuery(this, source, q);
+ else
+ eFatal("invalid query %s", source.toString().c_str());
+ }
else
query = new eDVBDBQuery(this, source, q);
return 0;
return 1;
}
+eDVBDBListQuery::eDVBDBListQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
+ :eDVBDBQueryBase(db, source, query), m_cursor(m_list.end())
+{
+}
+
+RESULT eDVBDBListQuery::getNextResult(eServiceReferenceDVB &ref)
+{
+ if (m_cursor != m_list.end())
+ {
+ ref = *m_cursor++;
+ return 0;
+ }
+ ref.type = eServiceReference::idInvalid;
+ return 1;
+}
+
+int eDVBDBListQuery::compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)
+{
+ if ( m_query->m_sort == eDVBChannelQuery::tSatellitePosition )
+ {
+ int x = (a.getDVBNamespace().get() >> 16);
+ int y = (b.getDVBNamespace().get() >> 16);
+ if ( x > 1800 )
+ x -= 3600;
+ if ( y > 1800 )
+ y -= 3600;
+ return x < y;
+ }
+ return a.name < b.name;
+}
+
+eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
+ :eDVBDBListQuery(db, source, query)
+{
+ 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)
+ {
+ 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)
+ {
+ eServiceReferenceDVB ref;
+ ref.setDVBNamespace(dvbnamespace);
+ ref.flags=eServiceReference::flagDirectory;
+ char buf[64];
+ snprintf(buf, 64, "(satellitePosition == %d) && ", dvbnamespace>>16);
+
+ ref.path=buf+source.path;
+ unsigned int pos=ref.path.find("FROM");
+ ref.path.erase(pos);
+ ref.path+="ORDER BY name";
+// eDebug("ref.path now %s", ref.path.c_str());
+ m_list.push_back(ref);
+
+ ref.path=buf+source.path;
+ pos=ref.path.find("FROM");
+ ref.path.erase(pos+5);
+ ref.path+="PROVIDERS ORDER BY name";
+// eDebug("ref.path now %s", ref.path.c_str());
+ m_list.push_back(ref);
+ }
+ }
+ }
+ m_cursor=m_list.begin();
+}
+
+eDVBDBProvidersQuery::eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
+ :eDVBDBListQuery(db, source, query)
+{
+ 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)
+ {
+ eServiceReferenceDVB ref;
+ char buf[64];
+ ref.name=provider_name;
+ snprintf(buf, 64, "(provider == \"%s\") && ", provider_name);
+ ref.path=buf+source.path;
+ unsigned int pos = ref.path.find("FROM");
+ ref.flags=eServiceReference::flagDirectory;
+ ref.path.erase(pos);
+ ref.path+="ORDER BY name";
+// eDebug("ref.path now %s", ref.path.c_str());
+ m_list.push_back(ref);
+ }
+ }
+ }
+ m_cursor=m_list.begin();
+}
+
/* (<name|provider|type|bouquet|satpos|chid> <==|...> <"string"|int>)[||,&& (..)] */
static int decodeType(const std::string &type)
int sort = eDVBChannelQuery::tName;
/* check for "ORDER BY ..." */
- while (tokens.size() > 2)
+ std::list<std::string>::iterator it = tokens.begin();
+ while (it != tokens.end())
{
- std::list<std::string>::iterator it = tokens.end();
- --it; --it; --it;
if (*it == "ORDER")
{
- ++it;
- if (*it == "BY")
+ tokens.erase(it++);
+ if (it != tokens.end() && *it == "BY")
{
- ++it;
+ tokens.erase(it++);
sort = decodeType(*it);
- tokens.pop_back(); // ...
- tokens.pop_back(); // BY
- tokens.pop_back(); // ORDER
+ tokens.erase(it++);
} else
sort = -1;
}
else if (*it == "FROM")
{
- ++it;
- if (*it == "BOUQUET")
+ tokens.erase(it++);
+ if (it != tokens.end() && *it == "BOUQUET")
{
- ++it;
+ tokens.erase(it++);
bouquet_name = *it;
- tokens.pop_back(); // ...
- tokens.pop_back(); // FROM
- tokens.pop_back(); // BOUQUET
+ tokens.erase(it++);
+ }
+ else if (it != tokens.end() && *it == "SATELLITES")
+ tokens.erase(it++);
+ else if (it != tokens.end() && *it == "PROVIDERS")
+ tokens.erase(it++);
+ else
+ {
+ eDebug("FROM unknown %s", (*it).c_str());
+ tokens.erase(it++);
}
}
else
- break;
+ ++it;
}
if (sort == -1)
git.cweiske.de / enigma2.git / blobdiff