Ticket #10153: 10153-v1.patch

File 10153-v1.patch, 1.0 KB (added by danielk, 12 years ago)

Different implementation.

  • mythtv/libs/libmythtv/dtvmultiplex.cpp

    diff --git a/mythtv/libs/libmythtv/dtvmultiplex.cpp b/mythtv/libs/libmythtv/dtvmultiplex.cpp
    index 35b4666..69336ed 100644
    a b bool DTVMultiplex::ParseDVB_S2( 
    262262        return false;
    263263    }
    264264
     265    // For #10153, guess at modulation system based on modulation
     266    if (DTVModulationSystem::kModulationSystem_UNDEFINED == mod_sys)
     267    {
     268        mod_sys = (DTVModulation::kModulationQPSK == modulation) ?
     269            DTVModulationSystem::kModulationSystem_DVBS :
     270            DTVModulationSystem::kModulationSystem_DVBS2;
     271    }
     272   
     273    if ((DTVModulationSystem::kModulationSystem_DVBS  != mod_sys) &&
     274        (DTVModulationSystem::kModulationSystem_DVBS2 != mod_sys))
     275    {
     276        LOG(VB_GENERAL, LOG_ERR, LOC + "Unsupported S2 modulation system " +
     277            QString("parameter '%1', aborting.").arg(_mod_sys));
     278        return false;
     279    }
     280
    265281    if (!_rolloff.isEmpty())
    266282        ok &= rolloff.Parse(_rolloff);
    267283