DEFINE_REF(eDVBService);
-RESULT eBouquet::addService(const eServiceReference &ref)
+RESULT eBouquet::addService(const eServiceReference &ref, eServiceReference before)
{
list::iterator it =
std::find(m_services.begin(), m_services.end(), ref);
if ( it != m_services.end() )
return -1;
- m_services.push_back(ref);
+ if (before.valid())
+ {
+ it = std::find(m_services.begin(), m_services.end(), before);
+ m_services.insert(it, ref);
+ }
+ else
+ m_services.push_back(ref);
return 0;
}
}
eDVBService::eDVBService()
- :m_flags(0)
+ :m_cache(0), m_flags(0)
{
}
eDVBService::~eDVBService()
{
+ delete [] m_cache;
}
eDVBService &eDVBService::operator=(const eDVBService &s)
m_provider_name = s.m_provider_name;
m_flags = s.m_flags;
m_ca = s.m_ca;
- m_cache = s.m_cache;
+ copyCache(s.m_cache);
return *this;
}
return res;
}
-int eDVBService::getCachePID(cacheID id)
+bool eDVBService::cacheEmpty()
{
- std::map<int, int>::iterator it = m_cache.find(id);
- if ( it != m_cache.end() )
- return it->second;
- return -1;
+ if (m_cache)
+ for (int i=0; i < cacheMax; ++i)
+ if (m_cache[i] != -1)
+ return false;
+ return true;
+}
+
+void eDVBService::initCache()
+{
+ m_cache = new int[cacheMax];
+ memset(m_cache, -1, sizeof(int) * cacheMax);
}
-void eDVBService::setCachePID(cacheID id, int pid)
+void eDVBService::copyCache(int *source)
{
- if (pid == -1)
- m_cache.erase(id);
+ if (source)
+ {
+ if (!m_cache)
+ m_cache = new int[cacheMax];
+ memcpy(m_cache, source, cacheMax * sizeof(int));
+ }
else
+ {
+ delete [] m_cache;
+ m_cache = 0;
+ }
+}
+
+int eDVBService::getCacheEntry(cacheID id)
+{
+ if (id >= cacheMax || !m_cache)
+ return -1;
+ return m_cache[id];
+}
+
+void eDVBService::setCacheEntry(cacheID id, int pid)
+{
+ if (!m_cache)
+ initCache();
+ if (id < cacheMax)
m_cache[id] = pid;
}
if (line[1]=='s')
{
eDVBFrontendParametersSatellite sat;
- int frequency, symbol_rate, polarisation, fec, orbital_position, inversion;
- sscanf(line+2, "%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion);
+ int frequency, symbol_rate, polarisation, fec, orbital_position, inversion,
+ system=eDVBFrontendParametersSatellite::System::DVB_S,
+ modulation=eDVBFrontendParametersSatellite::Modulation::QPSK,
+ rolloff=eDVBFrontendParametersSatellite::RollOff::alpha_auto;
+ sscanf(line+2, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff);
sat.frequency = frequency;
sat.symbol_rate = symbol_rate;
sat.polarisation = polarisation;
sat.orbital_position =
orbital_position < 0 ? orbital_position + 3600 : orbital_position;
sat.inversion = inversion;
+ sat.system = system;
+ sat.modulation = modulation;
+ sat.roll_off = rolloff;
feparm->setDVBS(sat);
} else if (line[1]=='t')
{
{
int cid, val;
sscanf(v.c_str(), "%02d%04x", &cid, &val);
- s->m_cache[cid]=val;
+ s->setCacheEntry((eDVBService::cacheID)cid,val);
} else if (p == 'C')
{
int val;
sscanf(v.c_str(), "%04x", &val);
- s->m_ca.insert(val);
+ s->m_ca.push_front((uint16_t)val);
}
}
addService(ref, s);
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 > 1800 ? sat.orbital_position - 3600 : sat.orbital_position,
- sat.inversion);
+ if (sat.system == eDVBFrontendParametersSatellite::System::DVB_S2)
+ {
+ fprintf(f, "\ts %d:%d:%d:%d:%d:%d:%d:%d:%d\n",
+ sat.frequency, sat.symbol_rate,
+ sat.polarisation, sat.fec,
+ sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position,
+ sat.inversion,
+ sat.system,
+ sat.modulation,
+ sat.roll_off);
+ }
+ else
+ {
+ fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
+ sat.frequency, sat.symbol_rate,
+ sat.polarisation, sat.fec,
+ sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position,
+ sat.inversion);
+ }
}
if (!ch.m_frontendParameters->getDVBT(ter))
{
fprintf(f, "p:%s", i->second->m_provider_name.c_str());
// write cached pids
- for (std::map<int,int>::const_iterator ca(i->second->m_cache.begin());
- ca != i->second->m_cache.end(); ++ca)
- fprintf(f, ",c:%02d%04x", ca->first, ca->second);
+ for (int x=0; x < eDVBService::cacheMax; ++x)
+ {
+ int entry = i->second->getCacheEntry((eDVBService::cacheID)x);
+ if (entry != -1)
+ fprintf(f, ",c:%02d%04x", x, entry);
+ }
// write cached ca pids
- for (std::set<int>::const_iterator ca(i->second->m_ca.begin());
+ for (CAID_LIST::const_iterator ca(i->second->m_ca.begin());
ca != i->second->m_ca.end(); ++ca)
fprintf(f, ",C:%04x", *ca);
{
std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_services.find(serviceref));
if (it == m_services.end())
- {
- service->m_flags |= eDVBService::dxNewFound;
m_services.insert(std::pair<eServiceReferenceDVB, ePtr<eDVBService> >(serviceref, service));
- }
- else
- it->second->m_flags &= ~eDVBService::dxNewFound;
return 0;
}
int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)
{
ePtr<eDVBService> a_service, b_service;
-
int sortmode = m_query ? m_query->m_sort : eDVBChannelQuery::tName;
if ((sortmode == eDVBChannelQuery::tName) || (sortmode == eDVBChannelQuery::tProvider))
{
- if (m_db->getService(a, a_service))
+ if (a.name.empty() && m_db->getService(a, a_service))
return 1;
- if (m_db->getService(b, b_service))
+ if (b.name.empty() && m_db->getService(b, b_service))
return 1;
}
switch (sortmode)
{
case eDVBChannelQuery::tName:
- return a_service->m_service_name_sort < b_service->m_service_name_sort;
+ if (a_service)
+ {
+ if (b_service)
+ return a_service->m_service_name_sort < b_service->m_service_name_sort;
+ else
+ {
+ std::string str = b.name;
+ makeUpper(str);
+ return a_service->m_service_name_sort < str;
+ }
+ }
+ else if (b_service)
+ {
+ std::string str = a.name;
+ makeUpper(str);
+ return str < b_service->m_service_name_sort;
+ }
+ else
+ {
+ std::string aa = a.name, bb = b.name;
+ makeUpper(aa);
+ makeUpper(bb);
+ return aa < bb;
+ }
case eDVBChannelQuery::tProvider:
return a_service->m_provider_name < b_service->m_provider_name;
case eDVBChannelQuery::tType:
y -= 3600;
return x < y;
}
- return a.name < b.name;
+ std::string aa = a.name, bb = b.name;
+ makeUpper(aa);
+ makeUpper(bb);
+ return aa < bb;
}
eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
git.cweiske.de / enigma2.git / blobdiff