Skip to content

Commit

Permalink
Fixes #10153. Guess at DVB-S vs DVB-S2 when not explicitly set.
Browse files Browse the repository at this point in the history
The problem was discovered by Lawrence Rust. It has been decided not to fix the DVB API regression upstream, so this code attempts to guess which system is being used using the modulation scheme as a hint.
  • Loading branch information
daniel-kristjansson committed Feb 27, 2012
1 parent 21784ce commit 1824969
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions mythtv/libs/libmythtv/dtvmultiplex.cpp
Expand Up @@ -262,6 +262,22 @@ bool DTVMultiplex::ParseDVB_S2(
return false;
}

// For #10153, guess at modulation system based on modulation
if (DTVModulationSystem::kModulationSystem_UNDEFINED == mod_sys)
{
mod_sys = (DTVModulation::kModulationQPSK == modulation) ?
DTVModulationSystem::kModulationSystem_DVBS :
DTVModulationSystem::kModulationSystem_DVBS2;
}

if ((DTVModulationSystem::kModulationSystem_DVBS != mod_sys) &&
(DTVModulationSystem::kModulationSystem_DVBS2 != mod_sys))
{
LOG(VB_GENERAL, LOG_ERR, LOC + "Unsupported S2 modulation system " +
QString("parameter '%1', aborting.").arg(_mod_sys));
return false;
}

if (!_rolloff.isEmpty())
ok &= rolloff.Parse(_rolloff);

Expand Down

0 comments on commit 1824969

Please sign in to comment.