summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2016-11-07 14:33:01 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2016-11-07 14:33:01 +0100
commit146f2cbd4d1c8d9a0238662ab9bb4e6a8848dba7 (patch)
treebb4cb4d9cefc5c5b6511d37162682e11427d30a6
parent8ea018404a4e3ac89ee50f762f0689a33b5f03b3 (diff)
downloadvdr-146f2cbd4d1c8d9a0238662ab9bb4e6a8848dba7.tar.gz
vdr-146f2cbd4d1c8d9a0238662ab9bb4e6a8848dba7.tar.bz2
Fixed initializing device specific parameters in cDvbTransponderParameters
-rw-r--r--HISTORY3
-rw-r--r--dvbdevice.c32
2 files changed, 18 insertions, 17 deletions
diff --git a/HISTORY b/HISTORY
index 8d669d16..89b4d2c5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8828,8 +8828,9 @@ Video Disk Recorder Revision History
- Empty adaptation field TS packets are now skipped when recording (thanks to
Christopher Reimer, based on the "AFFcleaner" by Stefan Pöschel).
-2015-09-16: Version 2.3.2
+2016-11-07: Version 2.3.2
- Fixed a crash when deleting a recording (reported by Oliver Endriss).
- Fixed an overflow of PIDs in a receiver (thanks to Robert Hannebauer).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Fixed initializing device specific parameters in cDvbTransponderParameters.
diff --git a/dvbdevice.c b/dvbdevice.c
index 63af52e7..b3d54c6d 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 4.2 2015/04/18 16:19:28 kls Exp $
+ * $Id: dvbdevice.c 4.3 2016/11/07 13:55:58 kls Exp $
*/
#include "dvbdevice.h"
@@ -201,21 +201,6 @@ int MapToDriver(int Value, const tDvbParameterMap *Map)
cDvbTransponderParameters::cDvbTransponderParameters(const char *Parameters)
{
- polarization = 0;
- inversion = INVERSION_AUTO;
- bandwidth = 8000000;
- coderateH = FEC_AUTO;
- coderateL = FEC_AUTO;
- modulation = QPSK;
- system = DVB_SYSTEM_1;
- transmission = TRANSMISSION_MODE_AUTO;
- guard = GUARD_INTERVAL_AUTO;
- hierarchy = HIERARCHY_AUTO;
- rollOff = ROLLOFF_AUTO;
- streamId = 0;
- t2systemId = 0;
- sisoMiso = 0;
- pilot = PILOT_AUTO;
Parse(Parameters);
}
@@ -266,6 +251,21 @@ const char *cDvbTransponderParameters::ParseParameter(const char *s, int &Value,
bool cDvbTransponderParameters::Parse(const char *s)
{
+ polarization = 0;
+ inversion = INVERSION_AUTO;
+ bandwidth = 8000000;
+ coderateH = FEC_AUTO;
+ coderateL = FEC_AUTO;
+ modulation = QPSK;
+ system = DVB_SYSTEM_1;
+ transmission = TRANSMISSION_MODE_AUTO;
+ guard = GUARD_INTERVAL_AUTO;
+ hierarchy = HIERARCHY_AUTO;
+ rollOff = ROLLOFF_AUTO;
+ streamId = 0;
+ t2systemId = 0;
+ sisoMiso = 0;
+ pilot = PILOT_AUTO;
while (s && *s) {
switch (toupper(*s)) {
case 'B': s = ParseParameter(s, bandwidth, BandwidthValues); break;