diff options
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | device.c | 6 | ||||
| -rw-r--r-- | dvbplayer.c | 4 | ||||
| -rw-r--r-- | libsi/headers.h | 4 | ||||
| -rw-r--r-- | osd.c | 4 | ||||
| -rw-r--r-- | timers.c | 4 |
7 files changed, 15 insertions, 14 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 73540998..89565ad6 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1305,7 +1305,7 @@ Reinhard Nissl <rnissl@gmx.de> for storing the original display size when handling DVB subtitles for reporting a problem with horizontal scaling of subtitles for fixing a buffer overflow in cFont::Bidi() - for avoiding an unecessary call to Recordings.ResetResume() + for avoiding an unnecessary call to Recordings.ResetResume() for debugging a problem in handling the bitmap color depth for scaled subtitles for making subtitle PIDs be decrypted for making cEITScanner process new transponders before old ones, to make sure @@ -2157,7 +2157,7 @@ Jürgen Schneider <ivory7@gmx.de> Christian Wieninger <cwieninger@gmx.de> for suggesting to add cMenuEditStrItem::InEditMode() for his idea of going directly into the "Edit timer" menu for a timer created - from the "Schedule" menu in case it starts withing the next two minutes + from the "Schedule" menu in case it starts within the next two minutes for reporting a problem with a format string in recording.c on 64bit systems for reporting a problem with the device selection in case of timer conflicts for a patch that fixed part of a crash in i18n character set conversion @@ -6604,7 +6604,7 @@ Video Disk Recorder Revision History to Ville Skyttä). - The Makefile now also installs the include files (thanks to Ville Skyttä). - Added handling of "ANSI/SCTE 57" descriptors (thanks to Rolf Ahrenberg). -- Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard +- Avoiding an unnecessary call to Recordings.ResetResume() (thanks to Reinhard Nissl). 2011-06-19: Version 1.7.19 @@ -7175,3 +7175,4 @@ Video Disk Recorder Revision History folder (provided you have write access to that folder). If a folder is newly created by a repeating timer, the sort mode for that folder is initially set to "by time". +- Fixed several spelling errors (thanks to Ville Skyttä). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 2.60 2012/04/26 09:40:36 kls Exp $ + * $Id: device.c 2.61 2012/06/09 14:37:24 kls Exp $ */ #include "device.h" @@ -271,7 +271,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView if (NumUsableSlots && !CamSlots.Get(j)->Assign(device[i], true)) continue; // CAM slot can't be used with this device bool ndr; - if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basicly able to do the job + if (device[i]->ProvidesChannel(Channel, Priority, &ndr)) { // this device is basically able to do the job if (NumUsableSlots && device[i]->CamSlot() && device[i]->CamSlot() != CamSlots.Get(j)) ndr = true; // using a different CAM slot requires detaching receivers // Put together an integer number that reflects the "impact" using @@ -803,7 +803,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView) EnsureAudioTrack(true); EnsureSubtitleTrack(); } - cStatus::MsgChannelSwitch(this, Channel->Number(), LiveView); // only report status if channel switch successfull + cStatus::MsgChannelSwitch(this, Channel->Number(), LiveView); // only report status if channel switch successful } return Result; diff --git a/dvbplayer.c b/dvbplayer.c index b325c989..f2cb2d20 100644 --- a/dvbplayer.c +++ b/dvbplayer.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbplayer.c 2.27 2012/05/06 11:02:35 kls Exp $ + * $Id: dvbplayer.c 2.28 2012/06/09 14:37:24 kls Exp $ */ #include "dvbplayer.h" @@ -513,7 +513,7 @@ void cDvbPlayer::Action(void) if (dropFrame) { if (!eof || (playDir != pdForward && dropFrame->Index() > 0) || (playDir == pdForward && dropFrame->Index() < readIndex)) { - ringBuffer->Drop(dropFrame); // the very first and last frame are continously repeated to flush data through the device + ringBuffer->Drop(dropFrame); // the very first and last frame are continuously repeated to flush data through the device dropFrame = NULL; } } diff --git a/libsi/headers.h b/libsi/headers.h index daea50e1..85c83b27 100644 --- a/libsi/headers.h +++ b/libsi/headers.h @@ -10,7 +10,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: headers.h 2.4 2012/01/11 11:35:17 kls Exp $ + * $Id: headers.h 2.5 2012/06/09 14:37:24 kls Exp $ * * ***************************************************************************/ @@ -2040,7 +2040,7 @@ struct descr_application_icons_descriptor_end { struct descr_simple_application_location_descriptor { u_char descriptor_tag :8; u_char descriptor_length :8; - /* inital_path_bytes */ + /* initial_path_bytes */ }; // Private DVB Descriptor Premiere.de @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 2.31 2012/06/02 13:32:38 kls Exp $ + * $Id: osd.c 2.32 2012/06/09 14:37:24 kls Exp $ */ #include "osd.h" @@ -130,7 +130,7 @@ void cPalette::SetAntiAliasGranularity(uint FixedColors, uint BlendColors) antiAliasGranularity = MAXNUMCOLORS - 1; else { int ColorsForBlending = MAXNUMCOLORS - FixedColors; - int ColorsPerBlend = ColorsForBlending / BlendColors + 2; // +2 = the full foreground and background colors, which are amoung the fixed colors + int ColorsPerBlend = ColorsForBlending / BlendColors + 2; // +2 = the full foreground and background colors, which are among the fixed colors antiAliasGranularity = double(MAXNUMCOLORS - 1) / (ColorsPerBlend - 1); } } @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 2.10 2012/06/03 13:04:23 kls Exp $ + * $Id: timers.c 2.11 2012/06/09 14:37:24 kls Exp $ */ #include "timers.h" @@ -280,7 +280,7 @@ bool cTimer::Parse(const char *s) free(aux); aux = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %a argument - //XXX results in an empty string (this first occured when the EIT gathering + //XXX results in an empty string (this first occurred when the EIT gathering //XXX was put into a separate thread - don't know why this happens... //XXX As a cure we copy the original string and add a blank. //XXX If anybody can shed some light on why sscanf() failes here, I'd love |