cleanup the plugins to fit the new namespace

[enigma2.git] / lib / dvb / db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 3920053d9e45761c7507a88d7276329104dfed54..579161467e593bc71e9ea0e58a8568670f642417 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -107,6 +107,12 @@ err:
        return -1;
 }
 
+RESULT eBouquet::setListName(const std::string &name)
+{
+       m_bouquet_name = name;
+       return 0;
+}
+
 eDVBService::eDVBService()
 {
 }
@@ -229,7 +235,7 @@ void eDVBService::setCachePID(cacheID id, int 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(CONFIGDIR"/enigma2/lamedb", "rt");
@@ -239,7 +245,7 @@ void eDVBDB::load()
                if ( !stat("lamedb", &s) )
                {
                        rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
-                       load();
+                       reloadServicelist();
                }
                return;
        }
@@ -406,7 +412,7 @@ void eDVBDB::load()
        fclose(f);
 }
 
-void eDVBDB::save()
+void eDVBDB::saveServicelist()
 {
        eDebug("---- saving lame channel db");
        FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "w");
@@ -583,8 +589,9 @@ void eDVBDB::loadBouquet(const char *path)
        eDebug("%d entries in Bouquet %s", entries, bouquet_name.c_str());
 }
 
-void eDVBDB::loadBouquets()
+void eDVBDB::reloadBouquets()
 {
+       m_bouquets.clear();
        loadBouquet("bouquets.tv");
        loadBouquet("bouquets.radio");
 // create default bouquets when missing
@@ -614,7 +621,7 @@ void eDVBDB::loadBouquets()
                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);
@@ -622,15 +629,17 @@ void eDVBDB::loadBouquets()
        }
 }
 
+eDVBDB *eDVBDB::instance;
+
 eDVBDB::eDVBDB()
 {
-       load();
-       loadBouquets();
+       instance = this;
+       reloadServicelist();
 }
 
 eDVBDB::~eDVBDB()
 {
-//     save();
+       instance=NULL;
 }
 
 RESULT eDVBDB::addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)
@@ -681,7 +690,7 @@ RESULT eDVBDB::getService(const eServiceReferenceDVB &reference, ePtr<eDVBServic
 
 RESULT eDVBDB::flush()
 {
-       save();
+       saveServicelist();
        return 0;
 }