diff options
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | ci.c | 6 | ||||
| -rw-r--r-- | dvbdevice.c | 16 | ||||
| -rw-r--r-- | themes.h | 4 |
4 files changed, 21 insertions, 8 deletions
@@ -7272,7 +7272,7 @@ Video Disk Recorder Revision History ".keep" to prevent a directory from being deleted when it is empty. Currently the only file name that is ignored is ".sort". -2012-10-04: Version 1.7.32 +2012-10-07: Version 1.7.32 - Pressing the Play key during normal live viewing mode now opens the Recordings menu if there is no "last viewed" recording (thanks to Alexander Wenzel). @@ -7288,3 +7288,4 @@ Video Disk Recorder Revision History - Changed DTV_DVBT2_PLP_ID to DTV_STREAM_ID in dvbdevice.c to adapt to an incompatible change in DVB API 5.8 (reported by Derek Kelly). Removed the meanwhile obsolete definition of FE_CAN_TURBO_FEC. +- Fixed some compiler warnings under gcc version 4.7.1. @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: ci.c 2.9 2012/05/29 11:13:40 kls Exp $ + * $Id: ci.c 2.10 2012/10/07 11:11:18 kls Exp $ */ #include "ci.h" @@ -845,9 +845,9 @@ void cCiDateTime::SendDateTime(void) int D = tm_gmt.tm_mday; int L = (M == 1 || M == 2) ? 1 : 0; int MJD = 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001); -#define DEC2BCD(d) (((d / 10) << 4) + (d % 10)) +#define DEC2BCD(d) uint8_t(((d / 10) << 4) + (d % 10)) struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; }; - tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : htons(tm_loc.tm_gmtoff / 60) }; + tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : short(htons(tm_loc.tm_gmtoff / 60)) }; bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer; DumpTPDUDataTransfer &= DumpDateTime; if (DumpDateTime) diff --git a/dvbdevice.c b/dvbdevice.c index 0ea7a2e3..d3ade755 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.73 2012/10/04 12:44:13 kls Exp $ + * $Id: dvbdevice.c 2.74 2012/10/07 11:11:30 kls Exp $ */ #include "dvbdevice.h" @@ -410,7 +410,7 @@ cString cDvbTuner::GetBondingParams(const cChannel *Channel) const return diseqc->Commands(); } else { - bool ToneOff = Channel->Frequency() < (unsigned int)Setup.LnbSLOF; + bool ToneOff = Channel->Frequency() < Setup.LnbSLOF; bool VoltOff = dtp.Polarization() == 'V' || dtp.Polarization() == 'R'; return cString::sprintf("%c %c", ToneOff ? 't' : 'T', VoltOff ? 'v' : 'V'); } @@ -576,40 +576,52 @@ int cDvbTuner::GetSignalQuality(void) const return 3; return 4; } +#ifdef DEBUG_SIGNALQUALITY bool HasSnr = true; +#endif uint16_t Snr; while (1) { if (ioctl(fd_frontend, FE_READ_SNR, &Snr) != -1) break; if (errno == EOPNOTSUPP) { Snr = 0xFFFF; +#ifdef DEBUG_SIGNALQUALITY HasSnr = false; +#endif break; } if (errno != EINTR) return -1; } +#ifdef DEBUG_SIGNALQUALITY bool HasBer = true; +#endif uint32_t Ber; while (1) { if (ioctl(fd_frontend, FE_READ_BER, &Ber) != -1) break; if (errno == EOPNOTSUPP) { Ber = 0; +#ifdef DEBUG_SIGNALQUALITY HasBer = false; +#endif break; } if (errno != EINTR) return -1; } +#ifdef DEBUG_SIGNALQUALITY bool HasUnc = true; +#endif uint32_t Unc; while (1) { if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1) break; if (errno == EOPNOTSUPP) { Unc = 0; +#ifdef DEBUG_SIGNALQUALITY HasUnc = false; +#endif break; } if (errno != EINTR) @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: themes.h 1.2 2007/08/05 14:10:22 kls Exp $ + * $Id: themes.h 2.1 2012/10/07 11:11:43 kls Exp $ */ #ifndef __THEMES_H @@ -56,7 +56,7 @@ public: }; // A helper macro that simplifies defining theme colors. -#define THEME_CLR(Theme, Subject, Color) static const int Subject = Theme.AddColor(#Subject, Color) +#define THEME_CLR(Theme, Subject, Color) static const tColor Subject = Theme.AddColor(#Subject, Color) class cThemes { private: |