DEFINE_REF(eDVBService);
+// the following three methodes are declared in idvb.h
+RESULT eBouquet::addService(const eServiceReference &ref)
+{
+ list::iterator it =
+ std::find(m_services.begin(), m_services.end(), ref);
+ if ( it != m_services.end() )
+ return -1;
+ m_services.push_back(ref);
+ return 0;
+}
+
+RESULT eBouquet::removeService(const eServiceReference &ref)
+{
+ list::iterator it =
+ std::find(m_services.begin(), m_services.end(), ref);
+ if ( it == m_services.end() )
+ return -1;
+ m_services.erase(it);
+ return 0;
+}
+
+RESULT eBouquet::moveService(const eServiceReference &ref, unsigned int pos)
+{
+ if ( pos < 0 || pos >= m_services.size() )
+ return -1;
+ list::iterator source=m_services.end();
+ list::iterator dest=m_services.end();
+ for (list::iterator it(m_services.begin()); it != m_services.end(); ++it)
+ {
+ if (dest == m_services.end() && !pos--)
+ dest = it;
+ if (*it == ref)
+ source = it;
+ 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);
+ return 0;
+}
+
eDVBService::eDVBService()
{
}
RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
{
- if ( ref.name.length() )
+ if (!ref.name.empty())
name = ref.name;
- else
+ else if (!m_service_name.empty())
name = m_service_name;
+ else
+ name = "(...)";
return 0;
}
sat.fec = fec;
sat.orbital_position = orbital_position;
sat.inversion = inversion;
- // ...
-// t.setSatellite(frequency, symbol_rate, polarisation, fec, sat, inversion);
feparm->setDVBS(sat);
} else if (line[1]=='t')
{
s->m_service_name = line;
s->m_service_name_sort = removeDVBChars(line);
makeUpper(s->m_service_name_sort);
-
+ while ((!s->m_service_name_sort.empty()) && s->m_service_name_sort[0] == ' ')
+ s->m_service_name_sort.erase(0, 1);
+
+ /* put unnamed services at the end, not at the beginning. */
+ if (s->m_service_name_sort.empty())
+ s->m_service_name_sort = "\xFF";
+
fgets(line, 256, f);
if (strlen(line))
line[strlen(line)-1]=0;
return 0;
}
-RESULT eDVBDB::getBouquet(const eServiceReference &ref, const eBouquet* &bouquet)
+RESULT eDVBDB::getBouquet(const eServiceReference &ref, eBouquet* &bouquet)
{
std::string str = ref.path;
if (str.empty())