From efdb7161844b7be58cdc5ec3308d8aaf5b257894 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 25 Jul 2009 14:13:05 +0200 Subject: more standard conform handling for dvb-text encodings with this fix no more special handling for UPC Direkt transponders on 19.2°E and CS Link on 23.5°E is needed but some polish providers still needs special handling... i think they interpreted the spec in the wrong way MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/base/encoding.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/base/encoding.cpp') diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp index 831de847..e4e1531c 100644 --- a/lib/base/encoding.cpp +++ b/lib/base/encoding.cpp @@ -42,14 +42,14 @@ eDVBTextEncodingHandler::eDVBTextEncodingHandler() } else if ( (sscanf( line, "0x%x 0x%x ISO%d", &tsid, &onid, &encoding ) == 3 && encoding == 6397 ) ||(sscanf( line, "%d %d ISO%d", &tsid, &onid, &encoding ) == 3 && encoding == 6397 ) ) - m_TransponderDefaultMapping[(tsid<<16)|onid]=64; + m_TransponderDefaultMapping[(tsid<<16)|onid]=0; else if ( sscanf( line, "%s ISO%d", countrycode, &encoding ) == 2 && encoding == 6397 ) { - m_CountryCodeDefaultMapping[countrycode]=64; + m_CountryCodeDefaultMapping[countrycode]=0; countrycode[0]=toupper(countrycode[0]); countrycode[1]=toupper(countrycode[1]); countrycode[2]=toupper(countrycode[2]); - m_CountryCodeDefaultMapping[countrycode]=64; + m_CountryCodeDefaultMapping[countrycode]=0; } else if ( (sscanf( line, "0x%x 0x%x", &tsid, &onid ) == 2 ) ||(sscanf( line, "%d %d", &tsid, &onid ) == 2 ) ) @@ -83,5 +83,5 @@ int eDVBTextEncodingHandler::getCountryCodeDefaultMapping( const std::string &co m_CountryCodeDefaultMapping.find(country_code); if ( it != m_CountryCodeDefaultMapping.end() ) return it->second; - return 0; // ISO8859-1 / Latin1 + return 0; // Latin1/ISO6397 } -- cgit v1.2.3