diff -u -r -N vdr-1.6.0/ci.c vdr-1.6.0-3/ci.c --- vdr-1.6.0/ci.c 2007-04-30 15:02:49.000000000 +0200 +++ vdr-1.6.0-3/ci.c 2011-12-30 23:00:20.127608901 +0100 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: ci.c 1.48 2007/04/30 13:02:49 kls Exp $ + * $Id: ci.c 1.48.1.1 2008/04/13 13:33:32 kls Exp $ */ #include "ci.h" @@ -1525,7 +1525,7 @@ cCamSlots CamSlots; -#define MODULE_CHECK_INTERVAL 100 // ms +#define MODULE_CHECK_INTERVAL 500 // ms #define MODULE_RESET_TIMEOUT 2 // s cCamSlot::cCamSlot(cCiAdapter *CiAdapter) diff -u -r -N vdr-1.6.0/config.h vdr-1.6.0-3/config.h --- vdr-1.6.0/config.h 2008-03-23 11:26:10.000000000 +0100 +++ vdr-1.6.0-3/config.h 2011-12-30 23:00:24.899608877 +0100 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.310 2008/03/23 10:26:10 kls Exp $ + * $Id: config.h 1.310.1.2 2008/09/07 09:33:03 kls Exp $ */ #ifndef __CONFIG_H @@ -22,7 +22,7 @@ // VDR's own version number: -#define VDRVERSION "1.6.0" +#define VDRVERSION "1.6.0-2" #define VDRVERSNUM 10600 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff -u -r -N vdr-1.6.0/CONTRIBUTORS vdr-1.6.0-3/CONTRIBUTORS --- vdr-1.6.0/CONTRIBUTORS 2008-03-18 18:34:00.000000000 +0100 +++ vdr-1.6.0-3/CONTRIBUTORS 2011-12-30 23:00:24.895608878 +0100 @@ -595,6 +595,8 @@ not two hex digits after the '#' for suggesting to suppress the automatic shutdown if the remote control is currently disabled + for suggesting to improve logging system time changes to avoid problems on slow + systems under heavy load Jeremy Hall for fixing an incomplete initialization of the filter parameters in eit.c @@ -958,6 +960,7 @@ for making the SVDRP command LSTC list the channels with group separators if the option ':groups' is given for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet() + for fixing initializing the timer's flags in the cTimer copy constructor Olivier Jacques ) for translating OSD texts to the French language @@ -1050,6 +1053,7 @@ language for fixing displaying the free disk space when entering the recordings menu where the last replayed recording was in a subdirectory, and pressing Back + for replacing the Finnish language code "smi" with "suo" Ralf Klueber for reporting a bug in cutting a recording if there is only a single editing mark @@ -1174,6 +1178,7 @@ for reporting an invalid access in the section handler when ending VDR for pointing out that cDevice::Transferring() doesn't return the right value in the early stage of channel switching + for fixing handling the counter in detection of pre 1.3.19 PS data Richard Robson for reporting freezing replay if a timer starts while in Transfer Mode from the @@ -1506,6 +1511,7 @@ for translating OSD texts to the Estonian language for fixing a missing ',' in the Greek OSD texts for fixing a missing ',' in the Swedish OSD texts + for reporting problems with CAMs when checking the CAM status too frequently Milos Kapoun for suggesting to skip code table info in SI data @@ -1574,6 +1580,7 @@ for making housekeeping wait for a while after a replay has ended for fixing error handling in cCuttingThread::Action() for suppressing the automatic shutdown if the remote control is currently disabled + for fixing a problem with calling isyslog() from within the SignalHandler() Sven Kreiensen for his help in keeping 'channels.conf.terr' up to date @@ -1890,6 +1897,7 @@ for fixing cTimer::operator=() in case a cTimer variable is assigned to itself for making the list of tracks given in cStatus::SetAudioTrack() NULL terminated for fixing handling kLeft in the calls to cStatus::MsgOsdTextItem() + for fixing a possible integer overflow in GetAbsTime() Philip Prindeville for updates to 'sources.conf' @@ -2111,6 +2119,7 @@ for making the non-breaking space symbol be rendered as a blank for fixing a signed character used as index in cBase64Encoder::NextLine() for fixing formatting the name section in the VDR man pages + for reporting unneeded include files und in remux.h Helge Lenz for reporting a bug in setting the 'Delta' parameter when calling the shutdown @@ -2347,3 +2356,10 @@ Nan Feng for translating OSD texts to the Chinese language + +Edgar Toernig + for suggesting to not call FcFini() to avoid problems with older (broken) versions + of fontconfig + +Winfried Köhler + for fixing wrong value for TableIdBAT in libsi/si.h diff -u -r -N vdr-1.6.0/device.c vdr-1.6.0-3/device.c --- vdr-1.6.0/device.c 2008-03-09 11:03:34.000000000 +0100 +++ vdr-1.6.0-3/device.c 2011-12-30 23:00:20.127608901 +0100 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 1.157 2008/03/09 10:03:34 kls Exp $ + * $Id: device.c 1.157.1.1 2008/04/13 11:16:00 kls Exp $ */ #include "device.h" @@ -1273,7 +1273,7 @@ uchar SubStreamIndex = SubStreamId & 0x1F; // Compatibility mode for old VDR recordings, where 0xBD was only AC3: -pre_1_3_19_PrivateStreamDeteced: +pre_1_3_19_PrivateStreamDetected: if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) { SubStreamId = c; SubStreamType = 0x80; @@ -1314,7 +1314,8 @@ if (pre_1_3_19_PrivateStream > MIN_PRE_1_3_19_PRIVATESTREAM) { dsyslog("switching to pre 1.3.19 Dolby Digital compatibility mode - substream id = %02X", SubStreamId); ClrAvailableTracks(); - goto pre_1_3_19_PrivateStreamDeteced; + pre_1_3_19_PrivateStream = MIN_PRE_1_3_19_PRIVATESTREAM + 1; + goto pre_1_3_19_PrivateStreamDetected; } } } diff -u -r -N vdr-1.6.0/dvbdevice.c vdr-1.6.0-3/dvbdevice.c --- vdr-1.6.0/dvbdevice.c 2008-02-09 17:11:44.000000000 +0100 +++ vdr-1.6.0-3/dvbdevice.c 2011-12-30 23:04:13.235607827 +0100 @@ -10,7 +10,6 @@ #include "dvbdevice.h" #include #include -#include #include #include #include @@ -514,82 +513,7 @@ uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY) { - if (devVideoIndex < 0) return NULL; - char buffer[PATH_MAX]; - snprintf(buffer, sizeof(buffer), "%s%d", DEV_VIDEO, devVideoIndex); - int videoDev = open(buffer, O_RDWR); - if (videoDev >= 0) { - uchar *result = NULL; - struct video_mbuf mbuf; - if (ioctl(videoDev, VIDIOCGMBUF, &mbuf) == 0) { - int msize = mbuf.size; - unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0); - if (mem && mem != (unsigned char *)-1) { - // set up the size and RGB - struct video_capability vc; - if (ioctl(videoDev, VIDIOCGCAP, &vc) == 0) { - struct video_mmap vm; - vm.frame = 0; - if ((SizeX > 0) && (SizeX <= vc.maxwidth) && - (SizeY > 0) && (SizeY <= vc.maxheight)) { - vm.width = SizeX; - vm.height = SizeY; - } - else { - vm.width = vc.maxwidth; - vm.height = vc.maxheight; - } - vm.format = VIDEO_PALETTE_RGB24; - if (ioctl(videoDev, VIDIOCMCAPTURE, &vm) == 0 && ioctl(videoDev, VIDIOCSYNC, &vm.frame) == 0) { - // make RGB out of BGR: - int memsize = vm.width * vm.height; - unsigned char *mem1 = mem; - for (int i = 0; i < memsize; i++) { - unsigned char tmp = mem1[2]; - mem1[2] = mem1[0]; - mem1[0] = tmp; - mem1 += 3; - } - - if (Quality < 0) - Quality = 100; - - dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height); - if (Jpeg) { - // convert to JPEG: - result = RgbToJpeg(mem, vm.width, vm.height, Size, Quality); - if (!result) - esyslog("ERROR: failed to convert image to JPEG"); - } - else { - // convert to PNM: - char buf[32]; - snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", vm.width, vm.height); - int l = strlen(buf); - int bytes = memsize * 3; - Size = l + bytes; - result = MALLOC(uchar, Size); - if (result) { - memcpy(result, buf, l); - memcpy(result + l, mem, bytes); - } - else - esyslog("ERROR: failed to convert image to PNM"); - } - } - } - munmap(mem, msize); - } - else - esyslog("ERROR: failed to memmap video device"); - } - close(videoDev); - return result; - } - else - LOG_ERROR_STR(buffer); - return NULL; } void cDvbDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat) diff -u -r -N vdr-1.6.0/dvbdevice.h vdr-1.6.0-3/dvbdevice.h --- vdr-1.6.0/dvbdevice.h 2008-02-08 14:48:31.000000000 +0100 +++ vdr-1.6.0-3/dvbdevice.h 2011-12-30 23:11:02.023605948 +0100 @@ -15,8 +15,8 @@ #include "device.h" #include "dvbspu.h" -#if DVB_API_VERSION != 3 -#error VDR requires Linux DVB driver API version 3! +#if DVB_API_VERSION < 3 +#error VDR requires Linux DVB driver API version greater or equal 3! #endif #define MAXDVBDEVICES 8 diff -u -r -N vdr-1.6.0/eit.c vdr-1.6.0-3/eit.c --- vdr-1.6.0/eit.c 2007-08-26 12:56:33.000000000 +0200 +++ vdr-1.6.0-3/eit.c 2011-12-30 23:00:20.127608901 +0100 @@ -8,7 +8,7 @@ * Robert Schneider and Rolf Hakenes . * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg . * - * $Id: eit.c 1.126 2007/08/26 10:56:33 kls Exp $ + * $Id: eit.c 1.126.1.1 2008/04/13 11:46:38 kls Exp $ */ #include "eit.h" @@ -300,9 +300,9 @@ if (diff > 2) { mutex.Lock(); if (abs(diff - lastDiff) < 3) { - isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim); - isyslog("Local Time = %s (%ld)", *TimeToString(sattim), sattim); - if (stime(&sattim) < 0) + if (stime(&sattim) == 0) + isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(sattim), sattim); + else esyslog("ERROR while setting system time: %m"); } lastDiff = diff; diff -u -r -N vdr-1.6.0/font.c vdr-1.6.0-3/font.c --- vdr-1.6.0/font.c 2008-03-01 11:19:41.000000000 +0100 +++ vdr-1.6.0-3/font.c 2011-12-30 23:00:24.899608877 +0100 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: font.c 1.25 2008/03/01 10:19:41 kls Exp $ + * $Id: font.c 1.25.1.1 2008/05/03 09:59:24 kls Exp $ */ #include "font.h" @@ -395,7 +395,7 @@ FcFontSetDestroy(fontset); FcPatternDestroy(pat); FcObjectSetDestroy(os); - FcFini(); + //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once FontNames->Sort(); } return FontNames->Size() > 0; @@ -431,7 +431,7 @@ esyslog("ERROR: no usable font found for '%s'", FontName); FcPatternDestroy(pat); free(fn); - FcFini(); + //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once } return FontFileName; } diff -u -r -N vdr-1.6.0/HISTORY vdr-1.6.0-3/HISTORY --- vdr-1.6.0/HISTORY 2008-03-23 11:26:08.000000000 +0100 +++ vdr-1.6.0-3/HISTORY 2011-12-30 23:00:24.899608877 +0100 @@ -5729,3 +5729,32 @@ - Added Chinese language texts (thanks to Nan Feng). - Updated the Portuguese language texts. - Added a note about VDR_CHARSET_OVERRIDE to the INSTALL file. + +2008-04-13: Version 1.6.0-1 + +- Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard + Nissl). +- Improved logging system time changes to avoid problems on slow systems under + heavy load (suggested by Helmut Auer). +- Fixed initializing the timer's flags in the cTimer copy constructor (thanks to + Andreas Mair). +- Increased the time between checking the CAM status to 500ms to avoid problems + with some CAMs (reported by Arthur Konovalov). + +2008-09-06: Version 1.6.0-2 + +- Updated the Italian OSD texts (thanks to Diego Pierotto). +- The SVDRP signon message now indicates the character encoding in use, as in + "220 video SVDRP VideoDiskRecorder 1.7.1; Fri May 2 16:17:10 2008; ISO-8859-1". + This may be useful for instance for external tools that provide EPG data, so that + they can correctly encode the strings. +- No longer calling FcFini() to avoid problems with older (broken) versions of + fontconfig (suggested by Edgar Toernig). +- Updated the sources.conf file (thanks to Oleg Roitburd). +- Fixed a possible integer overflow in GetAbsTime() (thanks to Alexander Rieger). +- Fixed a problem with calling isyslog() from within the SignalHandler() (thanks + to Udo Richter). +- Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg). +- Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried Köhler). +- Removed unneeded include files und from remux.h + (reported by Tobias Grimm). diff -u -r -N vdr-1.6.0/i18n.c vdr-1.6.0-3/i18n.c --- vdr-1.6.0/i18n.c 2008-01-19 13:07:11.000000000 +0100 +++ vdr-1.6.0-3/i18n.c 2011-12-30 23:00:24.899608877 +0100 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: i18n.c 1.319 2008/01/19 12:07:11 kls Exp $ + * $Id: i18n.c 1.319.1.1 2008/09/06 12:21:17 kls Exp $ * * */ @@ -45,7 +45,7 @@ "por", "fra,fre", "nor", - "fin,smi", + "fin,suo", "pol", "esl,spa", "ell,gre", diff -u -r -N vdr-1.6.0/libsi/si.h vdr-1.6.0-3/libsi/si.h --- vdr-1.6.0/libsi/si.h 2007-04-22 15:32:09.000000000 +0200 +++ vdr-1.6.0-3/libsi/si.h 2011-12-30 23:00:24.899608877 +0100 @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: si.h 1.17 2007/04/22 13:32:09 kls Exp $ + * $Id: si.h 1.17.1.1 2008/09/06 12:40:49 kls Exp $ * * ***************************************************************************/ @@ -28,7 +28,7 @@ TableIdNIT_other = 0x41, //network information section, other network TableIdSDT = 0x42, //service description section TableIdSDT_other = 0x46, - TableIdBAT = 0x46, //bouquet association section + TableIdBAT = 0x4A, //bouquet association section TableIdEIT_presentFollowing = 0x4E, //event information section TableIdEIT_presentFollowing_other = 0x4F, //range from 0x50 to 0x5F diff -u -r -N vdr-1.6.0/po/ca_ES.po vdr-1.6.0-3/po/ca_ES.po --- vdr-1.6.0/po/ca_ES.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/ca_ES.po 2011-12-30 23:45:26.055596459 +0100 @@ -10,10 +10,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Catalanian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/cs_CZ.po vdr-1.6.0-3/po/cs_CZ.po --- vdr-1.6.0/po/cs_CZ.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/cs_CZ.po 2011-12-30 23:45:26.087596458 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-02-28 15:00+0200\n" "Last-Translator: Vladimír Bárta , Jiøí Dobrý \n" "Language-Team: Czech\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/da_DK.po vdr-1.6.0-3/po/da_DK.po --- vdr-1.6.0/po/da_DK.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/da_DK.po 2011-12-30 23:45:26.119596461 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: Danish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/de_DE.po vdr-1.6.0-3/po/de_DE.po --- vdr-1.6.0/po/de_DE.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/de_DE.po 2011-12-30 23:45:26.147596461 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2007-11-25 15:19+0200\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: German\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/el_GR.po vdr-1.6.0-3/po/el_GR.po --- vdr-1.6.0/po/el_GR.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/el_GR.po 2011-12-30 23:45:26.171596460 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: Greek\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-7\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/es_ES.po vdr-1.6.0-3/po/es_ES.po --- vdr-1.6.0/po/es_ES.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/es_ES.po 2011-12-30 23:45:26.199596460 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-02 17:25+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Spanish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/et_EE.po vdr-1.6.0-3/po/et_EE.po --- vdr-1.6.0/po/et_EE.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/et_EE.po 2011-12-30 23:45:26.223596457 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: Estonian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-13\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/fi_FI.po vdr-1.6.0-3/po/fi_FI.po --- vdr-1.6.0/po/fi_FI.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/fi_FI.po 2011-12-30 23:45:26.247596457 +0100 @@ -10,10 +10,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/fr_FR.po vdr-1.6.0-3/po/fr_FR.po --- vdr-1.6.0/po/fr_FR.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/fr_FR.po 2011-12-30 23:45:26.263596458 +0100 @@ -13,10 +13,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-02-27 18:14+0100\n" "Last-Translator: Jean-Claude Repetto \n" "Language-Team: French\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/hr_HR.po vdr-1.6.0-3/po/hr_HR.po --- vdr-1.6.0/po/hr_HR.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/hr_HR.po 2011-12-30 23:45:26.275596459 +0100 @@ -9,10 +9,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" "Last-Translator: Adrian Caval \n" "Language-Team: Croatian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/hu_HU.po vdr-1.6.0-3/po/hu_HU.po --- vdr-1.6.0/po/hu_HU.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/hu_HU.po 2011-12-30 23:45:26.291596457 +0100 @@ -10,10 +10,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2007-12-01 21:42+0200\n" "Last-Translator: István Füley \n" "Language-Team: Hungarian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/it_IT.po vdr-1.6.0-3/po/it_IT.po --- vdr-1.6.0/po/it_IT.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/it_IT.po 2011-12-30 23:45:26.307596460 +0100 @@ -11,10 +11,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" -"PO-Revision-Date: 2008-03-08 21:06+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" +"PO-Revision-Date: 2008-04-17 01:07+0100\n" "Last-Translator: Diego Pierotto \n" -"Language-Team: Italian\n" +"Language-Team: Italian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -221,7 +222,7 @@ msgstr "Disco" msgid "free" -msgstr "liberi" +msgstr "disponibile" msgid "Free To Air" msgstr "in chiaro" @@ -230,7 +231,7 @@ msgstr "codificato" msgid "auto" -msgstr "automatico" +msgstr "automatica" msgid "Edit channel" msgstr "Modifica canale" @@ -293,7 +294,7 @@ msgstr "CoderateH" msgid "none" -msgstr "nessuno" +msgstr "nessuna" msgid "CoderateL" msgstr "CoderateL" @@ -404,20 +405,20 @@ msgstr "Prossimi programmi" msgid "Button$Next" -msgstr "Prossimo" +msgstr "Prossimi" msgid "Button$Now" msgstr "Adesso" msgid "Button$Schedule" -msgstr "Programma" +msgstr "Programmi" msgid "Can't switch channel!" msgstr "Impossibile cambiare canale!" #, c-format msgid "Schedule - %s" -msgstr "Programma - %s" +msgstr "Programmi - %s" #, c-format msgid "This event - %s" @@ -500,7 +501,7 @@ msgstr "Altezza OSD" msgid "Setup.OSD$Message time (s)" -msgstr "Tempo del messaggio (s)" +msgstr "Durata del messaggio (s)" msgid "Setup.OSD$Use small font" msgstr "Utilizza caratteri piccoli" @@ -572,7 +573,7 @@ msgstr "Mostra vecchi dati EPG (min)" msgid "Setup.EPG$Set system time" -msgstr "Imposta orario automatico" +msgstr "Imposta orario di sistema" msgid "Setup.EPG$Use time from transponder" msgstr "Utilizza orario da transponder" @@ -628,7 +629,7 @@ msgstr "Dolby Digital" msgid "Setup.DVB$Update channels" -msgstr "Aggiorna i canali" +msgstr "Aggiornamento canali" msgid "Setup.DVB$Audio languages" msgstr "Lingue audio" @@ -739,7 +740,7 @@ msgstr "Nome reg. immediata" msgid "Setup.Recording$Instant rec. time (min)" -msgstr "Tempo reg. immediata (min)" +msgstr "Durata reg. immediata (min)" msgid "Setup.Recording$Max. video file size (MB)" msgstr "Dim. massima file video (MB)" @@ -899,7 +900,7 @@ msgstr "Plugin" msgid "Up/Dn for new location - OK to move" -msgstr "Su/Giù per nuova posizione - OK per muovere" +msgstr "Su/Giù per nuova posizione - OK per spostare" msgid "Channel locked (recording)!" msgstr "Canale bloccato (in registrazione)!" diff -u -r -N vdr-1.6.0/po/nl_NL.po vdr-1.6.0-3/po/nl_NL.po --- vdr-1.6.0/po/nl_NL.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/nl_NL.po 2011-12-30 23:45:26.323596459 +0100 @@ -11,10 +11,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n" "Last-Translator: Johan Schuring \n" "Language-Team: Dutch\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/nn_NO.po vdr-1.6.0-3/po/nn_NO.po --- vdr-1.6.0/po/nn_NO.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/nn_NO.po 2011-12-30 23:45:26.347596459 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: Norwegian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/pl_PL.po vdr-1.6.0-3/po/pl_PL.po --- vdr-1.6.0/po/pl_PL.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/pl_PL.po 2011-12-30 23:45:26.375596459 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n" "Last-Translator: Michael Rakowski \n" "Language-Team: Polish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/pt_PT.po vdr-1.6.0-3/po/pt_PT.po --- vdr-1.6.0/po/pt_PT.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/pt_PT.po 2011-12-30 23:45:26.391596457 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-18 17:04+0100\n" "Last-Translator: anonymous\n" "Language-Team: Portuguese\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/ro_RO.po vdr-1.6.0-3/po/ro_RO.po --- vdr-1.6.0/po/ro_RO.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/ro_RO.po 2011-12-30 23:45:26.407596460 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-02-25 00:39+0100\n" "Last-Translator: Lucian Muresan \n" "Language-Team: Romanian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/ru_RU.po vdr-1.6.0-3/po/ru_RU.po --- vdr-1.6.0/po/ru_RU.po 2008-03-23 11:31:29.000000000 +0100 +++ vdr-1.6.0-3/po/ru_RU.po 2011-12-30 23:45:26.435596460 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-02-15 16:37+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: Russian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-5\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/sl_SI.po vdr-1.6.0-3/po/sl_SI.po --- vdr-1.6.0/po/sl_SI.po 2008-03-23 11:31:30.000000000 +0100 +++ vdr-1.6.0-3/po/sl_SI.po 2011-12-30 23:45:26.463596459 +0100 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-02-28 19:44+0100\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: Slovenian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/sv_SE.po vdr-1.6.0-3/po/sv_SE.po --- vdr-1.6.0/po/sv_SE.po 2008-03-23 11:31:30.000000000 +0100 +++ vdr-1.6.0-3/po/sv_SE.po 2011-12-30 23:45:26.479596456 +0100 @@ -10,10 +10,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-12 18:25+0100\n" "Last-Translator: Magnus Andersson \n" "Language-Team: Swedish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/tr_TR.po vdr-1.6.0-3/po/tr_TR.po --- vdr-1.6.0/po/tr_TR.po 2008-03-23 11:31:30.000000000 +0100 +++ vdr-1.6.0-3/po/tr_TR.po 2011-12-30 23:45:26.507596458 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeçen \n" "Language-Team: Turkish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-9\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/uk_UA.po vdr-1.6.0-3/po/uk_UA.po --- vdr-1.6.0/po/uk_UA.po 2008-03-23 11:31:30.000000000 +0100 +++ vdr-1.6.0-3/po/uk_UA.po 2011-12-30 23:45:26.535596459 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 12:22+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-07 14:17+0200\n" "Last-Translator: Yarema Aka Knedlyk \n" "Language-Team: Ukrainian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-5\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/po/zh_CN.po vdr-1.6.0-3/po/zh_CN.po --- vdr-1.6.0/po/zh_CN.po 2008-03-23 11:31:30.000000000 +0100 +++ vdr-1.6.0-3/po/zh_CN.po 2011-12-30 23:45:26.547596456 +0100 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-22 13:28+0100\n" +"POT-Creation-Date: 2011-12-30 23:45+0100\n" "PO-Revision-Date: 2008-03-21 08:44+0800\n" "Last-Translator: Nan Feng \n" "Language-Team: Chinese\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u -r -N vdr-1.6.0/recording.c vdr-1.6.0-3/recording.c --- vdr-1.6.0/recording.c 2008-02-24 11:28:53.000000000 +0100 +++ vdr-1.6.0-3/recording.c 2011-12-30 23:17:19.531604214 +0100 @@ -509,8 +509,8 @@ Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH); Subtitle = SubtitleBuffer; } - char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); - char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); + const char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE); + const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE); if (macroTITLE || macroEPISODE) { name = strdup(Timer->File()); name = strreplace(name, TIMERMACRO_TITLE, Title); @@ -551,7 +551,7 @@ sortBuffer = NULL; fileName = strdup(FileName); FileName += strlen(VideoDirectory) + 1; - char *p = strrchr(FileName, '/'); + const char *p = strrchr(FileName, '/'); name = NULL; info = new cRecordingInfo; @@ -1022,10 +1022,10 @@ if (recording) { cThreadLock DeletedRecordingsLock(&DeletedRecordings); Del(recording, false); - char *ext = strrchr(recording->FileName(), '.'); + char *ext = strrchr(recording->fileName, '.'); if (ext) { strncpy(ext, DELEXT, strlen(ext)); - recording->fileSizeMB = DirSizeMB(recording->FileName()); + recording->fileSizeMB = DirSizeMB(recording->fileName); recording->deleted = time(NULL); DeletedRecordings.Add(recording); } diff -u -r -N vdr-1.6.0/remux.h vdr-1.6.0-3/remux.h --- vdr-1.6.0/remux.h 2007-09-02 12:19:06.000000000 +0200 +++ vdr-1.6.0-3/remux.h 2011-12-30 23:00:24.899608877 +0100 @@ -4,14 +4,12 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remux.h 1.17 2007/09/02 10:19:06 kls Exp $ + * $Id: remux.h 1.17.1.1 2008/09/06 14:34:42 kls Exp $ */ #ifndef __REMUX_H #define __REMUX_H -#include //XXX FIXME: DVB/linux/dvb/dmx.h should include itself!!! -#include #include "ringbuffer.h" #include "tools.h" diff -u -r -N vdr-1.6.0/sources.conf vdr-1.6.0-3/sources.conf --- vdr-1.6.0/sources.conf 2007-02-17 17:15:13.000000000 +0100 +++ vdr-1.6.0-3/sources.conf 2011-12-30 23:00:24.899608877 +0100 @@ -19,29 +19,34 @@ # Europe -S5E Sirius 2/3 +S3E Telecom 2C +S4E Eurobird 4 +S5E Sirius 4 S7E Eutelsat W3A +S9E Eurobird 9 S10E Eutelsat W1 -S13E Hotbird 1-3/6/7A +S13E Hotbird 6/7A/8 S16E Eutelsat W2 -S19.2E Astra 1B/C/E/F/G/H/2C +S19.2E Astra F/G/H/KR/L S21.0E Afristar 1 S21.6E Eutelsat W6 -S23.5E Astra 1D 3A -S26E Arabsat 2D/2C/3A +S23.5E Astra 1E/3A +S25.5E Eurobird 2 +S26E Badr 3/4/6 S28.2E Astra 2D/A/B -S28.5E Eurobird 1 & Astra 2A/B/D +S28.5E Eurobird 1 & Astra 2A/B/C/D S30.5E Arabsat 2B +S31.5E Astra 1D/5A S33E Eurobird 3 & Intelsat 802 S36E Eutelsat W4 & Sesat S38E Paksat 1 S39E Hellas Sat 2 S40E Express AM1 -S42E Turksat 1C/2A +S42E Turksat 2A/3A S45E Intelsat 12 S49E Yamal 202 S53E Express AM 22 -S55E Insat 3E & Intelsat 702 +S55E Insat 3E S56E Bonum 1 S57E NSS 703 S60E Intelsat 904 @@ -54,10 +59,10 @@ # Asia -S74E Insat 3C & Edusat -S75E LMI 1 +S74E Insat 3C/4CR & Edusat +S75E ABS 1 S76.5E Telstar 10 -S78.5E Thaicom 2/3 +S78.5E Thaicom 2/5 S80E Express AM2 S83E Insat 2E/3B/4A S85.2E Intelsat 709 @@ -65,14 +70,17 @@ S88E ST 1 S90E Yamal 201 S91.5E Measat 1 -S93.5E Insat 3A +S92.2E Chinasat 9 +S93.5E Insat 3A/4B S95E NSS 6 -S96.5E Express AM 11 +S96.5E Express AM 33 +S98.5E Protostar 1 S100.5E Asiasat 2 S103E Express A2 +S105E Asiastar S105.5E Asiasat 3S S107.7E Cakrawarta 1 -S108E Telkom 1 & AAP 1 +S108E Telkom 1 & NSS 11 S110E N-Sat 110 & BSAT 1A/2A S110.5E Sinosat 1 S113E Palapa C2 & Koreasat 2 @@ -81,38 +89,38 @@ S120E Thaicom 1A S122.2E Asiasat 4 S124E JCSAT 4a +S125E Sinosat 3 S128E JCSAT 3 -S132E N-Star A +S132E Vinasat 1 & JCSAT5a S134E Apstar 6 -S136E N-Star B S138E Telstar 18 S140E Express AM 3 S144E Superbird C S146E Agila 2 S148E Measat 2 S150E JCSAT R -S152E Optus B3 +S152E Optus D2 S154E JCSAT 2A S156E Optus C1 S158E Superbird A -S160E Optus B1 +S160E Optus D1 S162E Superbird B2 -S164E Optus A3 +S164E Optus B3 S166E Intelsat 8 S169E Intelsat 2 -S172E AMC 23 +S172E GE 23 S180E Intelsat 701 S177W NSS 5 # Atlantic -S1W Thor 2/3 & Intelsat 10-02 -S4W Amos 1/2 +S1W Thor 3/5 & Intelsat 10-02 +S4W Amos 1/2/3 S5W Atlantic Bird 3 -S7W Nilesat 101 & 102 +S7W Nilesat 101/102 & Atlantic Bird 4 S8W Telecom 2D & Atlantic Bird 2 S11W Express A3 -S12.5W Atlantic Bird 2 +S12.5W Atlantic Bird 1 S14W Express A4 S15W Telstar 12 S18W Intelsat 901 @@ -123,9 +131,9 @@ S30W Hispasat 1C/1D S31.5W Intelsat 801 S34.5W Intelsat 903 -S37.5W Telstar 11 & AMC 12 +S37.5W NSS 10 S40.5W NSS 806 -S43W Intelsat 3R/6B +S43W Intelsat 3R/11 S45W Intelsat 1R S50W Intelsat 705 S53W Intelsat 707 @@ -137,47 +145,45 @@ S61.5W Echostar 3 & Rainbow 1 S63W Estrelo de Sul 1 -S65W Brasilsat B2 -S70W Brasilsat B1 +S65W Star One C1 +S70W Star One C2 S72W Nahuel 1 & AMC 6 -S72.5W DirecTV 1 -S74W SBS 6 -S77W Echostar 4 +S72.5W DirecTV 1R & Echostar 6 +S74W Horizons 2 +S77W Echostar 4 & Galaxy 4R S79W AMC5 -S79.5W Nimiq 3 S82W Nimiq 2 S83W AMC 9 -S84W Brasilsat B3 -S85W AMC 2 +S84W Brasilsat B3/4 +S85W AMC 16 S85.1W XM 3 S87W AMC3 S89W Galaxy 28 -S91W Galaxy 11 & Nimiq 1 -S91.5W DirecTV 2 -S92W Brasilsat B4 +S91W Galaxy 11/17 & Nimiq 1 +S92W Brasilsat B2 S93W Galaxy 26 S95W Galaxy 3C S97W Galaxy 25 -S99W Galaxy 4R -S99.2W Spaceway 2 -S101W DirecTV 1R/4S/8 & AMC4 +S99W Galaxy 16 +S99.2W Spaceway 2 & DirecTV 11 +S101W DirecTV 4S/8 & AMC 2/4 S103W AMC1 -S105W AMC15 +S105W AMC15/18 S107.3W Anik F1/F1R -S110W DirecTV 5 & Echostar 6/8/10 +S110W DirecTV 5 & Echostar 8/10 S111.1W Anik F2 -S113W Solidaridad 2 -S119W Echostar 7 & DirecTV 7S +S113W SatMex 6 +S116.8W SatMex 5 +S119W Anik F3 & Echostar 7 & DirecTV 7S S121W Echostar 9 & Galaxy 23 -S123W Galaxy 10R +S123W Galaxy 18 S125W Galaxy 14 S127W Galaxy 13/Horizons 1 S129W Echostar 5 & Galaxy 27 S131W AMC 11 -S133W Galaxy15/1R +S133W Galaxy15 S135W AMC 10 S137W AMC 7 -S138.5W Echostar 10 S139W AMC 8 S148W Echostar 1/2 diff -u -r -N vdr-1.6.0/svdrp.c vdr-1.6.0-3/svdrp.c --- vdr-1.6.0/svdrp.c 2008-02-17 14:36:01.000000000 +0100 +++ vdr-1.6.0-3/svdrp.c 2011-12-30 23:45:16.931596503 +0100 @@ -10,7 +10,7 @@ * and interact with the Video Disk Recorder - or write a full featured * graphical interface that sits on top of an SVDRP connection. * - * $Id: svdrp.c 1.109 2008/02/17 13:36:01 kls Exp $ + * $Id: svdrp.c 1.109.1.1 2008/05/02 14:29:16 kls Exp $ */ #include "svdrp.h" @@ -736,7 +736,7 @@ char *strtok_next; FileName = strtok_r(p, delim, &strtok_next); // image type: - char *Extension = strrchr(FileName, '.'); + const char *Extension = strrchr(FileName, '.'); if (Extension) { if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0) Jpeg = true; @@ -795,16 +795,16 @@ char RealFileName[PATH_MAX]; if (FileName) { if (grabImageDir) { - cString s; - char *slash = strrchr(FileName, '/'); + cString s(FileName); + const char *slash = strrchr(FileName, '/'); if (!slash) { s = AddDirectory(grabImageDir, FileName); FileName = s; } slash = strrchr(FileName, '/'); // there definitely is one - *slash = 0; - char *r = realpath(FileName, RealFileName); - *slash = '/'; + cString t(s); + t.Truncate(slash-FileName); + const char *r = realpath(t, RealFileName); if (!r) { LOG_ERROR_STR(FileName); Reply(501, "Invalid file name \"%s\"", FileName); @@ -1606,7 +1606,7 @@ char buffer[BUFSIZ]; gethostname(buffer, sizeof(buffer)); time_t now = time(NULL); - Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, *TimeToString(now)); + Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", buffer, VDRVERSION, *TimeToString(now), cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8"); } if (NewConnection) lastActivity = time(NULL); diff -u -r -N vdr-1.6.0/thread.c vdr-1.6.0-3/thread.c --- vdr-1.6.0/thread.c 2008-02-15 15:17:42.000000000 +0100 +++ vdr-1.6.0-3/thread.c 2011-12-30 23:00:24.903608877 +0100 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: thread.c 1.64 2008/02/15 14:17:42 kls Exp $ + * $Id: thread.c 1.64.1.1 2008/08/16 11:00:40 kls Exp $ */ #include "thread.h" @@ -24,11 +24,12 @@ { struct timeval now; if (gettimeofday(&now, NULL) == 0) { // get current time - now.tv_usec += MillisecondsFromNow * 1000; // add the timeout - while (now.tv_usec >= 1000000) { // take care of an overflow - now.tv_sec++; - now.tv_usec -= 1000000; - } + now.tv_sec += MillisecondsFromNow / 1000; // add full seconds + now.tv_usec += (MillisecondsFromNow % 1000) * 1000; // add microseconds + if (now.tv_usec >= 1000000) { // take care of an overflow + now.tv_sec++; + now.tv_usec -= 1000000; + } Abstime->tv_sec = now.tv_sec; // seconds Abstime->tv_nsec = now.tv_usec * 1000; // nano seconds return true; diff -u -r -N vdr-1.6.0/timers.c vdr-1.6.0-3/timers.c --- vdr-1.6.0/timers.c 2008-02-16 15:47:40.000000000 +0100 +++ vdr-1.6.0-3/timers.c 2011-12-30 23:00:20.127608901 +0100 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 1.73 2008/02/16 14:47:40 kls Exp $ + * $Id: timers.c 1.73.1.1 2008/04/13 12:47:12 kls Exp $ */ #include "timers.h" @@ -92,6 +92,7 @@ channel = NULL; aux = NULL; event = NULL; + flags = tfNone; *this = Timer; } diff -u -r -N vdr-1.6.0/vdr.c vdr-1.6.0-3/vdr.c --- vdr-1.6.0/vdr.c 2008-03-14 14:22:39.000000000 +0100 +++ vdr-1.6.0-3/vdr.c 2011-12-30 23:00:24.903608877 +0100 @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.313 2008/03/14 13:22:39 kls Exp $ + * $Id: vdr.c 1.313.1.1 2008/09/06 11:07:52 kls Exp $ */ #include @@ -141,7 +141,6 @@ static void SignalHandler(int signum) { - isyslog("caught signal %d", signum); switch (signum) { case SIGPIPE: break; @@ -1288,9 +1287,11 @@ ReportEpgBugFixStats(); if (WatchdogTimeout > 0) dsyslog("max. latency time %d seconds", MaxLatencyTime); - isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode()); + if (LastSignal) + isyslog("caught signal %d", LastSignal); if (ShutdownHandler.EmergencyExitRequested()) esyslog("emergency exit!"); + isyslog("exiting, exit code %d", ShutdownHandler.GetExitCode()); if (SysLogLevel > 0) closelog(); if (HasStdin)