diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | ci.c | 6 | ||||
| -rw-r--r-- | config.h | 10 |
4 files changed, 15 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5f2087c7..70fe1361 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3141,6 +3141,8 @@ Sören Moch <smoch@web.de> for pointing out that FindHeader() can also be used in cMpeg2Fixer::AdjTref() for reporting a problem with detecting user inactivity in case the system time is changed after VDR has been started + for reporting that the change "Fixed some compiler warnings with Clang 3.4.1" caused + ci.c to no longer compile with older versions of gcc Peter Münster <pmlists@free.fr> for fixing 'make install' to not overwrite existing configuration files @@ -8202,3 +8202,8 @@ Video Disk Recorder Revision History - Fixed the replay progress display for very long recordings. - Fixed detecting broken video data streams when recording. - Fixed handling frame detection buffer length (reported by Eike Sauer). + +2014-02-25: Version 2.1.6 + +- Revoked "Fixed some compiler warnings with Clang 3.4.1" from ci.c, because this + did not compile with older versions of gcc (thanks to Sören Moch). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: ci.c 3.11 2014/02/08 12:25:55 kls Exp $ + * $Id: ci.c 3.12 2014/02/25 09:59:55 kls Exp $ */ #include "ci.h" @@ -864,7 +864,7 @@ void cCiDateTime::SendDateTime(void) #pragma pack(1) struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; }; #pragma pack() - 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)) }; + 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) @@ -1004,7 +1004,7 @@ void cCiMMI::Process(int Length, const uint8_t *Data) case DCC_SET_MMI_MODE: if (l == 2 && *++d == MM_HIGH_LEVEL) { struct tDisplayReply { uint8_t id; uint8_t mode; }; - tDisplayReply dr = { .id = DRI_MMI_MODE_ACK, .mode = MM_HIGH_LEVEL }; + tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL }; dbgprotocol("Slot %d: ==> Display Reply (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId()); SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr); } @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 3.7 2014/01/26 12:31:58 kls Exp $ + * $Id: config.h 3.8 2014/02/25 10:00:23 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "2.1.5" -#define VDRVERSNUM 20105 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "2.1.6" +#define VDRVERSNUM 20106 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "2.1.5" -#define APIVERSNUM 20105 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "2.1.6" +#define APIVERSNUM 20106 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to |