diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | channels.c | 4 | ||||
| -rw-r--r-- | epg.c | 4 | ||||
| -rwxr-xr-x | epg2html.pl | 3 | ||||
| -rw-r--r-- | libsi/descriptor.c | 4 | ||||
| -rw-r--r-- | sources.conf | 8 | ||||
| -rwxr-xr-x | summary2info.pl | 4 | ||||
| -rw-r--r-- | svdrphosts.conf | 2 | ||||
| -rw-r--r-- | tools.c | 4 |
10 files changed, 18 insertions, 19 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3091b97e..61baad09 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1786,7 +1786,7 @@ Jaroslaw Swierczynski <swiergot@gmail.com> Alexander Hans <cleditor@arcor.de> for reporting a crash when pressing '0' in the "Schedule" menu on a channel that - doesn't have any EPG data + doesn't have any EPG data for giving the DrawBitmap() function a new parameter 'Overlay' that allows a bitmap to be drawn with a transparent background @@ -4504,7 +4504,7 @@ Video Disk Recorder Revision History - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Fixed a crash when setting the time transponder in the Setup menu, caused by the - new 'noneString' in cMenuEditChanItem (reported by Thomas Günther). + new 'noneString' in cMenuEditChanItem (reported by Thomas Günther). - Added NULL checks to some strdup() calls in menuitems.c (suggested by Darren Salt). - Removed the unnecessary 'value' member from cMenuEditItem. @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.c 1.50 2006/04/14 10:44:57 kls Exp $ + * $Id: channels.c 1.51 2006/04/17 12:18:57 kls Exp $ */ #include "channels.h" @@ -295,7 +295,7 @@ bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarizatio return false; // Sometimes the symbol rate is off by one if (abs(srate - Srate) <= 1) - Srate = srate; + Srate = srate; if (source != Source || frequency != Frequency || polarization != Polarization || srate != Srate || coderateH != CoderateH) { if (Number()) { @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * - * $Id: epg.c 1.70 2006/03/26 14:06:11 kls Exp $ + * $Id: epg.c 1.71 2006/04/17 12:18:59 kls Exp $ */ #include "epg.h" @@ -698,7 +698,7 @@ const cEvent *cSchedule::GetFollowingEvent(void) const const cEvent *p = GetPresentEvent(); if (p) p = events.Next(p); - else { + else { time_t now = time(NULL); for (p = events.First(); p; p = events.Next(p)) { if (p->StartTime() >= now) diff --git a/epg2html.pl b/epg2html.pl index 6b258466..a18ec08b 100755 --- a/epg2html.pl +++ b/epg2html.pl @@ -12,7 +12,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: epg2html.pl 1.6 2004/03/28 11:15:01 kls Exp $ +# $Id: epg2html.pl 1.7 2006/04/17 12:19:08 kls Exp $ @Index = (); @@ -95,4 +95,3 @@ print INDEX "<html>\n<head><title>EPG Index</title><head>\n<body>\n"; print INDEX sort { lc($a) cmp lc($b) } @Index; print INDEX "</body>\n</html>\n"; close(INDEX); - diff --git a/libsi/descriptor.c b/libsi/descriptor.c index dc3b71aa..57a92488 100644 --- a/libsi/descriptor.c +++ b/libsi/descriptor.c @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: descriptor.c 1.19 2006/04/14 10:53:44 kls Exp $ + * $Id: descriptor.c 1.20 2006/04/17 12:19:15 kls Exp $ * * ***************************************************************************/ @@ -739,7 +739,7 @@ int LinkageDescriptor::getId() const { void ISO639LanguageDescriptor::Parse() { languageLoop.setData(data+sizeof(descr_iso_639_language), getLength()-sizeof(descr_iso_639_language)); - + //all this is for backwards compatibility only Loop::Iterator it; Language first; diff --git a/sources.conf b/sources.conf index 09ee0a41..f3da9ab0 100644 --- a/sources.conf +++ b/sources.conf @@ -29,7 +29,7 @@ S21.0E Afristar 1 S21.6E Eutelsat W6 S23.5E Astra 1D 3A S26E Arabsat 2D/2C/3A -S28.2E Astra 2D/A/B +S28.2E Astra 2D/A/B S28.5E Eurobird 1 & Astra 2A/B/D S30.5E Arabsat 2B S33E Eurobird 3 & Intelsat 802 @@ -46,11 +46,11 @@ S56E Bonum 1 S57E NSS 703 S60E Intelsat 904 S62E Intelsat 902 -S64E Intelsat 906 +S64E Intelsat 906 S66E Intelsat 704 S68.5E PAS 7/10 S70.5E Eutelsat W5 -S72E PAS 4 +S72E PAS 4 # Asia @@ -67,7 +67,7 @@ S90E Yamal 201 S91.5E Measat 1 S93.5E Insat 3A S95E NSS 6 -S96.5E Express AM 11 +S96.5E Express AM 11 S100.5E Asiasat 2 S103E Express A2 S105.5E Asiasat 3S diff --git a/summary2info.pl b/summary2info.pl index 5d68d794..15300e5d 100755 --- a/summary2info.pl +++ b/summary2info.pl @@ -10,7 +10,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: summary2info.pl 1.5 2005/09/17 09:20:31 kls Exp $ +# $Id: summary2info.pl 1.6 2006/04/17 12:19:24 kls Exp $ $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n"; @@ -41,7 +41,7 @@ for $SummaryFile (@SummaryFiles) { # if line 1 is too long, it can't be the short text, # so assume the short text is missing and concatenate # line 1 and line 2 to be the long text: - if (length($data[1]) > 80) { + if (length($data[1]) > 80) { $data[2] = $data[1] . "|" . $data[2]; $data[1] = ""; } diff --git a/svdrphosts.conf b/svdrphosts.conf index dec9c42a..57cdc160 100644 --- a/svdrphosts.conf +++ b/svdrphosts.conf @@ -3,7 +3,7 @@ # are allowed to connect to the SVDRP port of the Video # Disk Recorder (VDR) running on this system. # Syntax: -# +# # IP-Address[/Netmask] # @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 1.115 2006/03/19 12:28:16 kls Exp $ + * $Id: tools.c 1.116 2006/04/17 12:19:31 kls Exp $ */ #include "tools.h" @@ -39,7 +39,7 @@ void syslog_with_tid(int priority, const char *format, ...) snprintf(fmt, sizeof(fmt), "[%d] %s", cThread::ThreadId(), format); va_start(ap, format); vsyslog(priority, fmt, ap); - va_end(ap); + va_end(ap); } int BCD2INT(int x) |