use reloadBouquets instead of loadBouquets

[vuplus_dvbapp] / lib / dvb / db.h

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 430a5af..0947b34 100644 (file)
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -2,8 +2,8 @@
 #define __db_h
 
 #ifndef SWIG
-#include <lib/base/eptrlist.h>
 #include <lib/dvb/idvb.h>
+#include <lib/base/eptrlist.h>
 #include <set>
 class ServiceDescriptionSection;
 #endif
@@ -38,6 +38,9 @@ public:
        RESULT removeService(const eServiceReference &service);
        RESULT addFlag(const eServiceReference &service, unsigned int flagmask);
        RESULT removeFlag(const eServiceReference &service, unsigned int flagmask);
+       PyObject *readSatellites(SWIG_PYOBJECT(ePyObject) sat_list, SWIG_PYOBJECT(ePyObject) sat_dict, SWIG_PYOBJECT(ePyObject) tp_dict);
+       PyObject *readTerrestrials(SWIG_PYOBJECT(ePyObject) ter_list, SWIG_PYOBJECT(ePyObject) tp_dict);
+       PyObject *readCables(SWIG_PYOBJECT(ePyObject) cab_list, SWIG_PYOBJECT(ePyObject) tp_dict);
 #ifndef SWIG
        RESULT removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned int orb_pos);
        RESULT removeServices(eDVBChannelID chid, unsigned int orb_pos);
@@ -55,14 +58,16 @@ public:
 
        RESULT getBouquet(const eServiceReference &ref, eBouquet* &bouquet);
 //////
-       void saveServicelist();
        void loadBouquet(const char *path);
        eServiceReference searchReference(int tsid, int onid, int sid);
        eDVBDB();
        virtual ~eDVBDB();
 #endif
+       void loadServicelist(const char *filename);
        static eDVBDB *getInstance() { return instance; }
        void reloadServicelist();
+       void saveServicelist();
+       void saveServicelist(const char *file);
        void reloadBouquets();
 };