diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2010-04-11 13:02:42 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2010-04-11 13:02:42 +0200 |
| commit | 512522f259a5ef4836b5d03030d737515c0787d0 (patch) | |
| tree | 7e7da0252d06ae9c4f0fbbea27631d7dfb440ae3 /dvbdevice.c | |
| parent | 5a67f86207d068aae612aa2a78505d9b96394e87 (diff) | |
| download | vdr-512522f259a5ef4836b5d03030d737515c0787d0.tar.gz vdr-512522f259a5ef4836b5d03030d737515c0787d0.tar.bz2 | |
The various modulation types are now taken into account when selecting a device
Diffstat (limited to 'dvbdevice.c')
| -rw-r--r-- | dvbdevice.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index 6f9e501f..d5310b5b 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.35 2010/04/10 10:36:27 kls Exp $ + * $Id: dvbdevice.c 2.36 2010/04/11 10:47:00 kls Exp $ */ #include "dvbdevice.h" @@ -151,6 +151,14 @@ int MapToUser(int Value, const tDvbParameterMap *Map, const char **String) return -1; } +const char *MapToUserString(int Value, const tDvbParameterMap *Map) +{ + int n = DriverIndex(Value, Map); + if (n >= 0) + return Map[n].userString; + return "???"; +} + int MapToDriver(int Value, const tDvbParameterMap *Map) { int n = UserIndex(Value, Map); @@ -694,7 +702,22 @@ cDvbDevice::cDvbDevice(int Adapter, int Frontend) numProvidedSystems++; if (frontendType == SYS_DVBS2) numProvidedSystems++; - isyslog("frontend %d/%d provides %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], frontendInfo.name); + char Modulations[64]; + char *p = Modulations; + if (frontendInfo.caps & FE_CAN_QPSK) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QPSK, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_QAM_16) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_16, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_QAM_32) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_32, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_QAM_64) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_64, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_QAM_128) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_128, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_QAM_256) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(QAM_256, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_8VSB) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(VSB_8, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_16VSB) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(VSB_16, ModulationValues)); } + if (frontendInfo.caps & FE_CAN_PSK_8) { numProvidedSystems++; p += sprintf(p, ",%s", MapToUserString(PSK_8, ModulationValues)); } + if (p != Modulations) + p = Modulations + 1; // skips first ',' + else + p = (char *)"unknown modulations"; + isyslog("frontend %d/%d provides %s with %s (\"%s\")", adapter, frontend, DeliverySystems[frontendType], p, frontendInfo.name); dvbTuner = new cDvbTuner(CardIndex() + 1, fd_frontend, adapter, frontend, frontendType); } } |