From 59d1eb3595f46aa2bd5c381d295f88770deff3ce Mon Sep 17 00:00:00 2001
From: Karl Dietz <dekarl@users.sourceforge.net>
Date: Mon, 16 Jul 2012 07:41:45 +0200
Subject: [PATCH 8/8] fix braino in parser of delivery system descriptor
Use "a" instead of "auto" as default for DTVInversion to silence error.
Actualy show what inversion parameter is considered invalid.
Make both copies of the error message identical while here.
Fixes #10917
---
mythtv/libs/libmythtv/dtvmultiplex.cpp | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/mythtv/libs/libmythtv/dtvmultiplex.cpp b/mythtv/libs/libmythtv/dtvmultiplex.cpp
index 86e476e..a7b8915 100644
a
|
b
|
bool DTVMultiplex::ParseDVB_T( |
198 | 198 | if (!ok) |
199 | 199 | { |
200 | 200 | LOG(VB_GENERAL, LOG_WARNING, LOC + |
201 | | "Invalid inversion, falling back to 'auto'."); |
| 201 | QString("Invalid inversion parameter '%1', falling back to 'auto'.") |
| 202 | .arg(_inversion)); |
202 | 203 | ok = true; |
203 | 204 | } |
204 | 205 | |
… |
… |
bool DTVMultiplex::ParseDVB_S_and_C( |
224 | 225 | if (!ok) |
225 | 226 | { |
226 | 227 | LOG(VB_GENERAL, LOG_WARNING, LOC + |
227 | | "Invalid inversion, falling back to 'auto'"); |
| 228 | QString("Invalid inversion parameter '%1', falling back to 'auto'.") |
| 229 | .arg(_inversion)); |
228 | 230 | |
229 | 231 | ok = true; |
230 | 232 | } |
… |
… |
bool DTVMultiplex::FillFromDeliverySystemDesc(DTVTunerType type, |
398 | 400 | const TerrestrialDeliverySystemDescriptor cd(desc); |
399 | 401 | |
400 | 402 | return ParseDVB_T( |
401 | | QString().number(cd.FrequencyHz()), "auto", |
| 403 | QString().number(cd.FrequencyHz()), "a", |
402 | 404 | cd.BandwidthString(), cd.CodeRateHPString(), |
403 | 405 | cd.CodeRateLPString(), cd.ConstellationString(), |
404 | 406 | cd.TransmissionModeString(), cd.GuardIntervalString(), |
… |
… |
bool DTVMultiplex::FillFromDeliverySystemDesc(DTVTunerType type, |
418 | 420 | } |
419 | 421 | |
420 | 422 | return ParseDVB_S_and_C( |
421 | | QString().number(cd.FrequencyHz()), "auto", |
| 423 | QString().number(cd.FrequencyHz()), "a", |
422 | 424 | QString().number(cd.SymbolRateHz()), cd.FECInnerString(), |
423 | 425 | cd.ModulationString(), |
424 | 426 | cd.PolarizationString()); |
… |
… |
bool DTVMultiplex::FillFromDeliverySystemDesc(DTVTunerType type, |
427 | 429 | if (type == DTVTunerType::kTunerTypeDVBS2) |
428 | 430 | { |
429 | 431 | return ParseDVB_S2( |
430 | | QString().number(cd.FrequencyHz()), "auto", |
| 432 | QString().number(cd.FrequencyHz()), "a", |
431 | 433 | QString().number(cd.SymbolRateHz()), cd.FECInnerString(), |
432 | 434 | cd.ModulationString(), |
433 | 435 | cd.PolarizationString(), |
… |
… |
bool DTVMultiplex::FillFromDeliverySystemDesc(DTVTunerType type, |
444 | 446 | const CableDeliverySystemDescriptor cd(desc); |
445 | 447 | |
446 | 448 | return ParseDVB_S_and_C( |
447 | | QString().number(cd.FrequencyHz()), "auto", |
| 449 | QString().number(cd.FrequencyHz()), "a", |
448 | 450 | QString().number(cd.SymbolRateHz()), cd.FECInnerString(), |
449 | 451 | cd.ModulationString(), QString()); |
450 | 452 | } |