add week days to epg list

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

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 193394705c06ee1a34c2fb9d047a3f20c84a017f..0b1d4b543c7be80d5d50b3193829a72439e9f058 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -114,6 +114,7 @@ RESULT eBouquet::setListName(const std::string &name)
 }
 
 eDVBService::eDVBService()
+       :m_flags(0)
 {
 }
 
@@ -244,8 +245,11 @@ void eDVBDB::reloadServicelist()
                struct stat s;
                if ( !stat("lamedb", &s) )
                {
-                       rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
-                       reloadServicelist();
+                       if ( !stat(CONFIGDIR"/enigma2", &s) )
+                       {
+                               rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
+                               reloadServicelist();
+                       }
                }
                return;
        }
@@ -476,6 +480,7 @@ void eDVBDB::saveServicelist()
                                0);
 
                fprintf(f, "%s\n", i->second->m_service_name.c_str());
+
                fprintf(f, "p:%s", i->second->m_provider_name.c_str());
 
                // write cached pids
@@ -488,6 +493,9 @@ void eDVBDB::saveServicelist()
                        ca != i->second->m_ca.end(); ++ca)
                        fprintf(f, ",C:%04x", *ca);
 
+               if (i->second->m_flags)
+                       fprintf(f, ",f:%x", i->second->m_flags);
+
                fprintf(f, "\n");
                services++;
        }
@@ -760,6 +768,22 @@ RESULT eDVBDB::startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q
        return 0;
 }
 
+eServiceReference eDVBDB::searchReference(int tsid, int onid, int sid)
+{
+       eServiceID Sid(sid);
+       eTransportStreamID Tsid(tsid);
+       eOriginalNetworkID Onid(onid);
+       for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator sit(m_services.begin());
+               sit != m_services.end(); ++sit)
+       {
+               if (sit->first.getTransportStreamID() == Tsid &&
+                       sit->first.getOriginalNetworkID() == Onid &&
+                       sit->first.getServiceID() == Sid)
+                       return sit->first;
+       }
+       return eServiceReference();
+}
+
 DEFINE_REF(eDVBDBQueryBase);
 
 eDVBDBQueryBase::eDVBDBQueryBase(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)