From patchwork Mon Jun 4 15:21:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ville_Skytt=C3=A4?= X-Patchwork-Id: 12957 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SbZ5l-0000LA-5B for vdr@linuxtv.org; Mon, 04 Jun 2012 17:21:38 +0200 X-tubIT-Incoming-IP: 213.243.153.189 Received: from filtteri6.pp.htv.fi ([213.243.153.189]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SbZ5k-0000M9-F6; Mon, 04 Jun 2012 17:21:13 +0200 Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id CDC8A56E61F for ; Mon, 4 Jun 2012 18:21:10 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp4.welho.com ([213.243.153.38]) by localhost (filtteri6.pp.htv.fi [213.243.153.189]) (amavisd-new, port 10024) with ESMTP id b0KuJM6l9pAd for ; Mon, 4 Jun 2012 18:21:09 +0300 (EEST) Received: from michael.steam.fi.bobcat.mine.nu (cs78200229.pp.htv.fi [62.78.200.229]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp4.welho.com (Postfix) with ESMTPS id B49AA5BC010 for ; Mon, 4 Jun 2012 18:21:09 +0300 (EEST) From: =?UTF-8?q?Ville=20Skytt=C3=A4?= To: vdr@linuxtv.org Date: Mon, 4 Jun 2012 18:21:09 +0300 Message-Id: <1338823269-30541-1-git-send-email-ville.skytta@iki.fi> X-Mailer: git-send-email 1.7.10.2 MIME-Version: 1.0 X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.6.4.151219 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' RCVD_FROM_IP_DATE 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __DATE_TZ_RU 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS , __UTF8_SUBJ 0' X-LSpam-Score: -1.1 (-) X-LSpam-Report: No, score=-1.1 required=5.0 tests=BAYES_00=-1.9, RDNS_NONE=0.793 autolearn=no Subject: [vdr] =?utf-8?q?=5BPATCH=5D_Spelling_fixes=2E?= X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2012 15:21:38 -0000 Status: O X-Status: X-Keywords: X-UID: 26344 --- CONTRIBUTORS | 4 ++-- HISTORY | 2 +- device.c | 4 ++-- dvbplayer.c | 2 +- libsi/headers.h | 2 +- osd.c | 2 +- timers.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 54bb679..dc64ea9 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1303,7 +1303,7 @@ Reinhard Nissl 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 @@ -2148,7 +2148,7 @@ J Christian Wieninger 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 diff --git a/HISTORY b/HISTORY index 1a1c8a6..e102612 100644 --- a/HISTORY +++ b/HISTORY @@ -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 too 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 diff --git a/device.c b/device.c index 4679033..e15c9ff 100644 --- a/device.c +++ b/device.c @@ -266,7 +266,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 @@ -798,7 +798,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 622fa46..1bdb0de 100644 --- a/dvbplayer.c +++ b/dvbplayer.c @@ -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 a5df382..5588e4e 100644 --- a/libsi/headers.h +++ b/libsi/headers.h @@ -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 diff --git a/osd.c b/osd.c index 747e09c..2138765 100644 --- a/osd.c +++ b/osd.c @@ -120,7 +120,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); } } diff --git a/timers.c b/timers.c index 1f77041..5d0a80f 100644 --- a/timers.c +++ b/timers.c @@ -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