git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clear lcd - just keep the clock running
[enigma2.git]
/
lib
/
service
/
servicedvb.cpp
diff --git
a/lib/service/servicedvb.cpp
b/lib/service/servicedvb.cpp
index 94833f446f75d7a3a55d768156a8e40c8a0064df..77fe3faf0d592cbee53f12d08f130e507f6e2431 100644
(file)
--- a/
lib/service/servicedvb.cpp
+++ b/
lib/service/servicedvb.cpp
@@
-66,7
+66,7
@@
RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref
return err;
}
return err;
}
-
const
eBouquet *bouquet=0;
+ eBouquet *bouquet=0;
if ((err = db->getBouquet(ref, bouquet)) != 0)
{
eDebug("eStaticServiceDVBBouquetInformation::getName failed.. getBouquet failed!");
if ((err = db->getBouquet(ref, bouquet)) != 0)
{
eDebug("eStaticServiceDVBBouquetInformation::getName failed.. getBouquet failed!");
@@
-280,10
+280,9
@@
RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
if (eDVBResourceManager::getInstance(resm) || resm->getChannelList(db))
return -1;
if (eDVBResourceManager::getInstance(resm) || resm->getChannelList(db))
return -1;
- // FIXME!
- if (db->getBouquet(m_parent, (const eBouquet*&)m_bouquet) != 0)
+ if (db->getBouquet(m_parent, m_bouquet) != 0)
return -1;
return -1;
-
+
res = this;
return 0;
res = this;
return 0;
@@
-294,24
+293,30
@@
RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
RESULT eDVBServiceList::addService(eServiceReference &ref)
{
RESULT eDVBServiceList::addService(eServiceReference &ref)
{
- ASSERT(m_bouquet);
-
// return m_bouquet->addService(ref)
;
- return
-1
;
+ if (!m_bouquet)
+
return -1
;
+ return
m_bouquet->addService(ref)
;
}
RESULT eDVBServiceList::removeService(eServiceReference &ref)
{
}
RESULT eDVBServiceList::removeService(eServiceReference &ref)
{
- ASSERT(m_bouquet);
-
// return m_bouquet->removeService(ref)
;
- return
-1
;
+ if (!m_bouquet)
+
return -1
;
+ return
m_bouquet->removeService(ref)
;
}
RESULT eDVBServiceList::moveService(eServiceReference &ref, int pos)
{
}
RESULT eDVBServiceList::moveService(eServiceReference &ref, int pos)
{
- ASSERT(m_bouquet);
-
-// return m_bouquet->moveService(ref, pos);
- return -1;
+ if (!m_bouquet)
+ return -1;
+ return m_bouquet->moveService(ref, pos);
+}
+
+RESULT eDVBServiceList::flushChanges()
+{
+ if (!m_bouquet)
+ return -1;
+ return m_bouquet->flushChanges();
}
RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
}
RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)