diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-18 13:25:25 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-18 13:25:25 +0100 |
| commit | 88a7819026f53420d5b973acfd2590e58b0c49aa (patch) | |
| tree | a661ddd5519eff3076fc9c30118d3b9f6795dc0d /lib/dvb/db.cpp | |
| parent | 7fd9ffdeb796034ee631a795fb5bab31b035e8e7 (diff) | |
| parent | 18d5fedc236e3374f8a31af5e312d12bb16fd31d (diff) | |
| download | enigma2-88a7819026f53420d5b973acfd2590e58b0c49aa.tar.gz enigma2-88a7819026f53420d5b973acfd2590e58b0c49aa.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
Diffstat (limited to 'lib/dvb/db.cpp')
| -rw-r--r-- | lib/dvb/db.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp index e6108ab5..110cedd8 100644 --- a/lib/dvb/db.cpp +++ b/lib/dvb/db.cpp @@ -1201,15 +1201,17 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos) if ((unsigned int)sat.orbital_position != orbpos) remove=false; } - if ( remove && chid.dvbnamespace != eNs ) + if ( remove && chid.dvbnamespace != eNs ) // namespace given? { - if (system == iDVBFrontend::feCable && chid.dvbnamespace.get() == (int)0xFFFF0000) + if ( system == iDVBFrontend::feCable && chid.dvbnamespace.get() == (int)0xFFFF0000 ) ; - else if (system == iDVBFrontend::feTerrestrial && chid.dvbnamespace.get() == (int)0xEEEE0000) + else if ( system == iDVBFrontend::feTerrestrial && chid.dvbnamespace.get() == (int)0xEEEE0000 ) ; else if ( chid.dvbnamespace != ch.dvbnamespace ) remove=false; } + else if ( system == iDVBFrontend::feCable || system == iDVBFrontend::feTerrestrial ) + remove=false; if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id ) remove=false; if ( remove && chid.transport_stream_id != eTsid && chid.transport_stream_id != ch.transport_stream_id ) |