summaryrefslogtreecommitdiff
path: root/dvbdevice.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-01-13 12:27:18 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-01-13 12:27:18 +0100
commit9b754a67293634e1997a12226aa1e2f85f119114 (patch)
tree945ff3ccd5d6066129253fdb334de378cb81fb12 /dvbdevice.c
parent64f23b27d945a85c06bf432b65e032ed0f745373 (diff)
downloadvdr-9b754a67293634e1997a12226aa1e2f85f119114.tar.gz
vdr-9b754a67293634e1997a12226aa1e2f85f119114.tar.bz2
The parameters that are only used by "second generation" delivery systems (DVB-S2 and DVB-T2) are no longer written into channels.conf for "first generation" delivery systems
Diffstat (limited to 'dvbdevice.c')
-rw-r--r--dvbdevice.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/dvbdevice.c b/dvbdevice.c
index 92f6a72d..a69a981e 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 2.53 2012/01/11 12:31:06 kls Exp $
+ * $Id: dvbdevice.c 2.54 2012/01/13 12:23:33 kls Exp $
*/
#include "dvbdevice.h"
@@ -217,22 +217,22 @@ int cDvbTransponderParameters::PrintParameter(char *p, char Name, int Value) con
cString cDvbTransponderParameters::ToString(char Type) const
{
-#define ST(s) if (strchr(s, Type))
+#define ST(s) if (strchr(s, Type) && (strchr(s, '0' + system + 1) || strchr(s, '*')))
char buffer[64];
char *q = buffer;
*q = 0;
- ST(" S ") q += sprintf(q, "%c", polarization);
- ST(" T") q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
- ST(" CST") q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
- ST(" T") q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
- ST(" T") q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
- ST("ACST") q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
- ST("ACST") q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
- ST(" S ") q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
- ST(" T") q += PrintParameter(q, 'P', plpId);
- ST(" ST") q += PrintParameter(q, 'S', MapToUser(system, SystemValuesSat)); // we only need the numerical value, so Sat or Terr doesn't matter
- ST(" T") q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
- ST(" T") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
+ ST(" S *") q += sprintf(q, "%c", polarization);
+ ST(" T*") q += PrintParameter(q, 'B', MapToUser(bandwidth, BandwidthValues));
+ ST(" CST*") q += PrintParameter(q, 'C', MapToUser(coderateH, CoderateValues));
+ ST(" T*") q += PrintParameter(q, 'D', MapToUser(coderateL, CoderateValues));
+ ST(" T*") q += PrintParameter(q, 'G', MapToUser(guard, GuardValues));
+ ST("ACST*") q += PrintParameter(q, 'I', MapToUser(inversion, InversionValues));
+ ST("ACST*") q += PrintParameter(q, 'M', MapToUser(modulation, ModulationValues));
+ ST(" S 2") q += PrintParameter(q, 'O', MapToUser(rollOff, RollOffValues));
+ ST(" T2") q += PrintParameter(q, 'P', plpId);
+ ST(" ST*") q += PrintParameter(q, 'S', MapToUser(system, SystemValuesSat)); // we only need the numerical value, so Sat or Terr doesn't matter
+ ST(" T*") q += PrintParameter(q, 'T', MapToUser(transmission, TransmissionValues));
+ ST(" T*") q += PrintParameter(q, 'Y', MapToUser(hierarchy, HierarchyValues));
return buffer;
}