Fix Mediaplayer crash for WAV playback and add basic Audio CD support (needs kernel...

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

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index 25be7005ae11e026e9a3c896a18976395608d528..8d412ce76a006b22d63cdd81e29431da9de14e29 100644 (file)
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -153,7 +153,7 @@ RESULT eDVBScan::startFilter()
                        assert(i != m_PAT->getSections().end());
                        tsid = (*i)->getTableIdExtension(); // in PAT this is the transport stream id
 
-                       // KabelBW HACK ... on 618 Mhz the transport stream id in PAT and SDT is different
+                       // KabelBW HACK ... on 618Mhz and 626Mhz the transport stream id in PAT and SDT is different
                        {
                                int type;
                                m_ch_current->getSystem(type);
@@ -161,13 +161,17 @@ RESULT eDVBScan::startFilter()
                                {
                                        eDVBFrontendParametersCable parm;
                                        m_ch_current->getDVBC(parm);
-                                       if (tsid == 0x00d7 & abs(parm.frequency-618000) < 2000)
+                                       if ((tsid == 0x00d7 && abs(parm.frequency-618000) < 2000) ||
+                                               (tsid == 0x00d8 && abs(parm.frequency-626000) < 2000))
                                                tsid = -1;
                                }
                        }
                }
-               if (tsid == -1 && m_SDT->start(m_demux, eDVBSDTSpec()))
-                       return -1;
+               if (tsid == -1)
+               {
+                       if (m_SDT->start(m_demux, eDVBSDTSpec()))
+                               return -1;
+               }
                else if (m_SDT->start(m_demux, eDVBSDTSpec(tsid, true)))
                        return -1;
                CONNECT(m_SDT->tableReady, eDVBScan::SDTready);