git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add blinking dish-picture if positioner is moving (we need a function which returns...
[enigma2.git]
/
lib
/
dvb
/
db.cpp
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index 3f42da96c382408cb764ea1bbdae207b06242276..1bfc06ee8c7356789dbf824d01b98255433584fb 100644
(file)
--- a/
lib/dvb/db.cpp
+++ b/
lib/dvb/db.cpp
@@
-34,20
+34,31
@@
RESULT eBouquet::moveService(const eServiceReference &ref, unsigned int pos)
{
if ( pos < 0 || pos >= m_services.size() )
return -1;
{
if ( pos < 0 || pos >= m_services.size() )
return -1;
+ ++pos;
list::iterator source=m_services.end();
list::iterator dest=m_services.end();
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)
{
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)
dest = it;
if (*it == ref)
+ {
source = it;
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;
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;
}
return 0;
}
@@
-535,11
+546,6
@@
void eDVBDB::loadBouquet(const char *path)
eDebug("%d entries in Bouquet %s", entries, bouquet_name.c_str());
}
eDebug("%d entries in Bouquet %s", entries, bouquet_name.c_str());
}
-void eDVBDB::saveBouquet(const char *path)
-{
-
-}
-
void eDVBDB::loadBouquets()
{
loadBouquet("bouquets.tv");
void eDVBDB::loadBouquets()
{
loadBouquet("bouquets.tv");
@@
-579,11
+585,6
@@
void eDVBDB::loadBouquets()
}
}
}
}
-void eDVBDB::saveBouquets()
-{
-
-}
-
eDVBDB::eDVBDB()
{
load();
eDVBDB::eDVBDB()
{
load();
@@
-641,6
+642,12
@@
RESULT eDVBDB::getService(const eServiceReferenceDVB &reference, ePtr<eDVBServic
return 0;
}
return 0;
}
+RESULT eDVBDB::flush()
+{
+ save();
+ return 0;
+}
+
RESULT eDVBDB::getBouquet(const eServiceReference &ref, eBouquet* &bouquet)
{
std::string str = ref.path;
RESULT eDVBDB::getBouquet(const eServiceReference &ref, eBouquet* &bouquet)
{
std::string str = ref.path;