From eebe7c798a689dd1c627f4af5203902665cc2f21 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Wed, 16 Sep 2020 13:48:33 +0200
Subject: [PATCH] Fixed several typos

---
 CONTRIBUTORS    | 3 +++
 HISTORY         | 1 +
 PLUGINS.html    | 2 +-
 UPDATE-2.0.0    | 2 +-
 UPDATE-2.2.0    | 2 +-
 UPDATE-2.4.0    | 6 +++---
 device.c        | 6 +++---
 libsi/headers.h | 4 ++--
 lirc.c          | 4 ++--
 menu.c          | 4 ++--
 recording.h     | 4 ++--
 remux.h         | 4 ++--
 thread.c        | 4 ++--
 thread.h        | 4 ++--
 timers.c        | 4 ++--
 tools.h         | 4 ++--
 16 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3c1a5830..b9907e95 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3636,3 +3636,6 @@ J
 
 Stefan Verse <Verse@amotronics.de>
  for fixing an occasional black screen when switching channels
+
+Jens Schleusener <Jens.Schleusener@fossies.org>
+ for reporting several typos
diff --git a/HISTORY b/HISTORY
index 345f89b0..b764a911 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9520,3 +9520,4 @@ Video Disk Recorder Revision History
 - Fixed checking the return value of the Open() call in cFileName::SetOffset() (reported
   by Winfried Köhler).
 - Fixed a possible invalid lock sequence in cMenuTimers::OnOff().
+- Fixed several typos (reported by Jens Schleusener).
diff --git a/PLUGINS.html b/PLUGINS.html
index 39b5031e..1f41182f 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -1710,7 +1710,7 @@ restricts this to a <tt>cOsdObject</tt> returned from the plugin's <tt>MainMenuA
 function, or any of the skin classes a plugin might implement.
 <p>
 If a plugin runs a separate thread and wants to issue a message directly from
-within that tread, it can call
+within that thread, it can call
 
 <p><table><tr><td class="code"><pre>
 int cSkins::QueueMessage(eMessageType Type, const char *s, int Seconds = 0, int Timeout = 0);
diff --git a/UPDATE-2.0.0 b/UPDATE-2.0.0
index 6287a770..b59e29d6 100644
--- a/UPDATE-2.0.0
+++ b/UPDATE-2.0.0
@@ -224,7 +224,7 @@ OSD:
 - The OSD size is now automatically adjusted to the actual video display
   (provided the output device implements the GetOsdSize() function).
 - The OSD now has full TrueColor support. There can be several "pixmaps" that can
-  be overlayed with alpha blending. All existing skins should work out of the box
+  be overlaid with alpha blending. All existing skins should work out of the box
   with the TrueColor OSD - the only exception being cOsd::GetBitmap(). Since the
   TrueColor OSD doesn't use bitmaps, this function will return a dummy bitmap, which
   may not be what the plugin expects. As long as this bitmap is only used for setting
diff --git a/UPDATE-2.2.0 b/UPDATE-2.2.0
index 566da1f5..48ac59b1 100644
--- a/UPDATE-2.2.0
+++ b/UPDATE-2.2.0
@@ -408,7 +408,7 @@ Misc:
 - Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
   two separate positions.
 - Fixed cMarks::GetNextBegin() and cMarks::GetNextEnd(). The behavior of these two
-  functions is now exacly as described in the header file. Editing marks that are
+  functions is now exactly as described in the header file. Editing marks that are
   placed at exactly the same offset in a recording are now preserved in the cutting
   process.
 - The new command line option --chartab can be used to set the default character
diff --git a/UPDATE-2.4.0 b/UPDATE-2.4.0
index 417959f3..82ffbd35 100644
--- a/UPDATE-2.4.0
+++ b/UPDATE-2.4.0
@@ -56,7 +56,7 @@ Conditional Access:
   there is more than one CAM in the system.
   The file 'cam.data' is not written if it is read-only.
 - The mechanism of trying different CAMs when switching to an encrypted channel is
-  now only triggered if there acually is more than one CAM in the system.
+  now only triggered if there actually is more than one CAM in the system.
 - CAMs that can handle multiple devices at the same time can now indicate this
   by creating the first cCamSlot as usual, and every other cCamSlot by giving
   it the first one as its "MasterSlot". To VDR this means that when searching
@@ -79,7 +79,7 @@ Conditional Access:
 - CAMs are now sent a generated EIT packet that contains a single 'present event' for
   the current SID, in order to avoid any parental rating dialogs.
 - When selecting a device/CAM combination for live viewing, CAMs that are known to
-  decrypt the requested channel are now given a higher priority than prefering the
+  decrypt the requested channel are now given a higher priority than preferring the
   primary device.
 - Extended the CI API to allow plugins to implement additional CAM resources.
 - The new configuration file 'camresponses.conf' can be used to define automatic
@@ -402,7 +402,7 @@ Misc:
   buried under tons of text.
   Add VERBOSE=1 to the 'make' call in the VDR source directory to see the
   actual commands that are executed.
-  Plugin authors should modify their makefiles accordingly, by simply preceeding
+  Plugin authors should modify their makefiles accordingly, by simply preceding
   the respective commands with '$(Q)' and inserting '@echo XX $@' (where XX is one
   of the character combinations listed above) before the command.
   The newplugin script has also been modified accordingly.
diff --git a/device.c b/device.c
index e77bec2e..6b170565 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 4.35 2020/07/13 08:16:41 kls Exp $
+ * $Id: device.c 4.36 2020/09/16 13:48:33 kls Exp $
  */
 
 #include "device.h"
@@ -803,7 +803,7 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView)
   if (LiveView) {
      isyslog("switching to channel %d %s (%s)", Channel->Number(), *Channel->GetChannelID().ToString(), Channel->Name());
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
-                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
+                           // and, if decrypted, this removes the now superfluous PIDs from the CAM, too
      }
   for (int i = 3; i--;) {
       switch (SetChannel(Channel, LiveView)) {
@@ -826,7 +826,7 @@ bool cDevice::SwitchChannel(int Direction)
   Direction = sgn(Direction);
   if (Direction) {
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
-                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
+                           // and, if decrypted, this removes the now superfluous PIDs from the CAM, too
      int n = CurrentChannel() + Direction;
      int first = n;
      LOCK_CHANNELS_READ;
diff --git a/libsi/headers.h b/libsi/headers.h
index fa26eea3..f2c42010 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 4.1 2020/06/23 09:27:09 kls Exp $
+ *   $Id: headers.h 4.2 2020/09/16 13:48:33 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -2081,7 +2081,7 @@ struct descr_application_icons_descriptor_end {
    u_char icon_flags_lo                          :8;
 };
 
-/* 0x15 simple application location descrptor */
+/* 0x15 simple application location descriptor */
 
 #define DESCR_SIMPLE_APPLICATION_LOCATION_LEN 3
 
diff --git a/lirc.c b/lirc.c
index d02ae11e..9cc287a6 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 4.1 2017/05/30 11:02:17 kls Exp $
+ * $Id: lirc.c 4.2 2020/09/16 13:48:33 kls Exp $
  */
 
 #include "lirc.h"
@@ -89,7 +89,7 @@ void cLircRemote::Action(void)
            int count;
            char KeyName[LIRC_KEY_BUF];
            if (sscanf(buf, "%*x %x %29s", &count, KeyName) != 2) { // '29' in '%29s' is LIRC_KEY_BUF-1!
-              esyslog("ERROR: unparseable lirc command: %s", buf);
+              esyslog("ERROR: unparsable lirc command: %s", buf);
               continue;
               }
            int Delta = ThisTime.Elapsed(); // the time between two subsequent LIRC events
diff --git a/menu.c b/menu.c
index e680efc3..901ec5a3 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 4.84 2020/09/16 13:35:30 kls Exp $
+ * $Id: menu.c 4.85 2020/09/16 13:48:33 kls Exp $
  */
 
 #include "menu.h"
@@ -4729,7 +4729,7 @@ const cChannel *cDisplayChannel::NextAvailableChannel(const cChannel *Channel, i
 {
   if (Direction) {
      cControl::Shutdown(); // prevents old channel from being shown too long if GetDevice() takes longer
-                           // and, if decrypted, this removes the now superflous PIDs from the CAM, too
+                           // and, if decrypted, this removes the now superfluous PIDs from the CAM, too
      LOCK_CHANNELS_READ;
      while (Channel) {
            Channel = Direction > 0 ? Channels->Next(Channel) : Channels->Prev(Channel);
diff --git a/recording.h b/recording.h
index abcaf4d5..1ba16bdc 100644
--- a/recording.h
+++ b/recording.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.h 4.9 2020/03/29 15:50:22 kls Exp $
+ * $Id: recording.h 4.10 2020/09/16 13:48:33 kls Exp $
  */
 
 #ifndef __RECORDING_H
@@ -390,7 +390,7 @@ public:
        ///< If this cMarks object is used by multiple threads, the caller must Lock()
        ///< it before calling Add() and Unlock() it afterwards. The same applies to
        ///< calls to Del(), or any of the functions that return a "cMark *", in case
-       ///< an other thread might modifiy the list while the returned pointer is
+       ///< an other thread might modify the list while the returned pointer is
        ///< considered valid.
   const cMark *Get(int Position) const;
   const cMark *GetPrev(int Position) const;
diff --git a/remux.h b/remux.h
index eea8a844..6ff3c971 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 4.5 2017/05/21 09:44:52 kls Exp $
+ * $Id: remux.h 4.6 2020/09/16 13:48:33 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -221,7 +221,7 @@ int64_t PtsDiff(int64_t Pts1, int64_t Pts2);
        ///< properly taking into account the 33bit wrap around. If Pts2 is "before"
        ///< Pts1, the result is negative.
 
-// A transprent TS payload handler:
+// A transparent TS payload handler:
 
 class cTsPayload {
 private:
diff --git a/thread.c b/thread.c
index 2a5a8e99..2d3580b7 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 4.14 2018/03/05 22:38:10 kls Exp $
+ * $Id: thread.c 4.15 2020/09/16 13:48:33 kls Exp $
  */
 
 #include "thread.h"
@@ -184,7 +184,7 @@ bool cRwLock::Lock(bool Write, int TimeoutMs)
      }
   else if (writeLockThreadId == cThread::ThreadId()) {
      locked++; // there can be any number of stacked read locks, so we keep track here
-     Result = 0; // aquiring a read lock while holding a write lock within the same thread is OK
+     Result = 0; // acquiring a read lock while holding a write lock within the same thread is OK
      }
   else
      Result = TimeoutMs ? pthread_rwlock_timedrdlock(&rwlock, &abstime) : pthread_rwlock_rdlock(&rwlock);
diff --git a/thread.h b/thread.h
index 5c351bfa..16c4bd75 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 4.5 2020/03/29 15:53:48 kls Exp $
+ * $Id: thread.h 4.6 2020/09/16 13:48:33 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -215,7 +215,7 @@ public:
        ///< a write lock.
   void SetSyncStateKey(cStateKey &StateKey);
        ///< Sets the given StateKey to be synchronized to the state of this lock.
-       ///< The caller must currenty hold a write lock on this lock, with a cStateKey
+       ///< The caller must currently hold a write lock on this lock, with a cStateKey
        ///< that is different from the given StateKey. If, when removing the key that
        ///< is holding the write lock, the StateKey's current state is the same as that
        ///< of the lock, it will be increased together with the lock's state.
diff --git a/timers.c b/timers.c
index e4701ffa..874cfad1 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 4.19 2019/05/23 09:46:32 kls Exp $
+ * $Id: timers.c 4.20 2020/09/16 13:48:33 kls Exp $
  */
 
 #include "timers.h"
@@ -313,7 +313,7 @@ bool cTimer::Parse(const char *s)
   //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
+  //XXX If anybody can shed some light on why sscanf() fails here, I'd love
   //XXX to hear about that!
   char *s2 = NULL;
   int l2 = strlen(s);
diff --git a/tools.h b/tools.h
index 43cf0a82..5d1559a2 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 4.17 2020/06/23 15:52:29 kls Exp $
+ * $Id: tools.h 4.18 2020/09/16 13:48:33 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -222,7 +222,7 @@ cString strgetval(const char *s, const char *name, char d = '=');
     ///< Returns the value part of a 'name=value' pair in s.
     ///< name must either be at the beginning of s, or has to be preceded by white space.
     ///< There may be any number of white space around the '=' sign. The value is
-    ///< everyting up to (and excluding) the next white space, or the end of s.
+    ///< everything up to (and excluding) the next white space, or the end of s.
     ///< If an other delimiter shall be used (like, e.g., ':'), it can be given
     ///< as the third parameter.
     ///< If name occurs more than once in s, only the first occurrence is taken.