diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-02-18 09:48:54 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-02-18 09:48:54 +0000 |
| commit | 9f2f71f1f7d1bd21413860ab60296f1c8203e90b (patch) | |
| tree | a3ec4f3197732445239ea1bcc0686bc15cb270a3 /lib/dvb/db.cpp | |
| parent | dd6b7236b87a06c700ee8e3d7686230ea8e13159 (diff) | |
| download | enigma2-9f2f71f1f7d1bd21413860ab60296f1c8203e90b.tar.gz enigma2-9f2f71f1f7d1bd21413860ab60296f1c8203e90b.zip | |
add ability to read e1 bouquets
Diffstat (limited to 'lib/dvb/db.cpp')
| -rw-r--r-- | lib/dvb/db.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp index 6b6aa033..cf655690 100644 --- a/lib/dvb/db.cpp +++ b/lib/dvb/db.cpp @@ -615,7 +615,7 @@ void eDVBDB::loadBouquet(const char *path) break; if (line[0]=='#') { - if (!strncmp(line, "#SERVICE ", 9) || !strncmp(line, "#SERVICE: ", 10)) + if (!strncmp(line, "#SERVICE", 8)) { int offs = line[8] == ':' ? 10 : 9; eServiceReference tmp(line+offs); @@ -662,13 +662,17 @@ void eDVBDB::loadBouquet(const char *path) read_descr=true; ++entries; } - else if (read_descr && !strncmp(line, "#DESCRIPTION ", 13)) + else if (read_descr && !strncmp(line, "#DESCRIPTION", 12)) { - e->name = line+13; + int offs = line[12] == ':' ? 14 : 13; + e->name = line+offs; read_descr=false; } - else if (!strncmp(line, "#NAME ", 6)) - bouquet.m_bouquet_name=line+6; + else if (!strncmp(line, "#NAME ", 6) || !strncmp(line, "#NAME: ", 7)) + { + int offs = line[5] == ':' ? 7 : 6; + bouquet.m_bouquet_name=line+offs; + } continue; } } |