diff options
Diffstat (limited to 'lib/dvb')
| -rw-r--r-- | lib/dvb/db.cpp | 12 | ||||
| -rw-r--r-- | lib/dvb/db.h | 4 | ||||
| -rw-r--r-- | lib/dvb/decoder.cpp | 1 | ||||
| -rw-r--r-- | lib/dvb/pmt.cpp | 1 | ||||
| -rw-r--r-- | lib/dvb/stT1RVV7 | bin | 1490944 -> 0 bytes |
5 files changed, 10 insertions, 8 deletions
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp index 5426fa4b..1a2cd7df 100644 --- a/lib/dvb/db.cpp +++ b/lib/dvb/db.cpp @@ -126,7 +126,7 @@ eDVBDB::eDVBDB() if (strlen(line)) line[strlen(line)-1]=0; - eString str=line; + std::string str=line; if (str[1]!=':') // old ... (only service_provider) { @@ -136,15 +136,15 @@ eDVBDB::eDVBDB() { unsigned int c=str.find(','); char p=str[0]; - eString v; - if (c == eString::npos) + std::string v; + if (c == std::string::npos) { - v=str.mid(2); + v=str.substr(2); str=""; } else { - v=str.mid(2, c-2); - str=str.mid(c+1); + v=str.substr(2, c-2); + str=str.substr(c+1); } // eDebug("%c ... %s", p, v.c_str()); if (p == 'p') diff --git a/lib/dvb/db.h b/lib/dvb/db.h index fe4833cd..5a67870d 100644 --- a/lib/dvb/db.h +++ b/lib/dvb/db.h @@ -9,8 +9,8 @@ class eDVBService: public iObject DECLARE_REF; public: eDVBService(); - eString m_service_name; - eString m_provider_name; + std::string m_service_name; + std::string m_provider_name; int m_flags; std::set<int> m_ca; diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 0b3619ad..da529046 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1,3 +1,4 @@ +#include <lib/base/eerror.h> #include <lib/dvb/decoder.h> #include <linux/dvb/audio.h> #include <linux/dvb/video.h> diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index 4ab551f1..292012e1 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -1,3 +1,4 @@ +#include <lib/base/eerror.h> #include <lib/dvb/pmt.h> #include <lib/dvb/specs.h> #include <lib/dvb/dvb.h> diff --git a/lib/dvb/stT1RVV7 b/lib/dvb/stT1RVV7 Binary files differindex a9d6d3dc..e69de29b 100644 --- a/lib/dvb/stT1RVV7 +++ b/lib/dvb/stT1RVV7 |