summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--ci.h4
-rw-r--r--device.h8
-rw-r--r--dvbdevice.h4
-rw-r--r--font.h4
-rw-r--r--osd.h8
-rw-r--r--pat.h4
-rw-r--r--receiver.h4
-rw-r--r--recording.h6
-rw-r--r--ringbuffer.h4
-rw-r--r--skins.h4
-rw-r--r--tools.h6
13 files changed, 30 insertions, 28 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3772203b..c853bd1c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1923,6 +1923,7 @@ Ville Skyttä <ville.skytta@iki.fi>
for using pkg-config to get fribidi, freetype and fontconfig cflags and libs
for making the Makefile also install the include files
for fixing a crash when deleting a recording while cutting it
+ for fixing several spelling errors
Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 2ff8abaf..655d57e3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6770,3 +6770,4 @@ Video Disk Recorder Revision History
This obsoletes the LNBSHARE patch. Users of the LNBSHARE patch will need to newly
set up their sat devices with the above options.
- Fixed a crash when deleting a recording while cutting it (thanks to Ville Skyttä).
+- Fixed several spelling errors (thanks to Ville Skyttä).
diff --git a/ci.h b/ci.h
index 678f17ba..71bbdf9f 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: ci.h 1.23 2007/01/07 14:38:00 kls Exp $
+ * $Id: ci.h 2.1 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __CI_H
@@ -220,7 +220,7 @@ public:
///< CAM is currently not decrypting anything. If there is already a
///< channel being decrypted, a call to CanDecrypt() checks whether the
///< CAM can also decrypt the given channel. Only CAMs that have replied
- ///< to the inital QUERY will perform this check at all. CAMs that never
+ ///< to the initial QUERY will perform this check at all. CAMs that never
///< replied to the initial QUERY are assumed not to be able to handle
///< more than one channel at a time.
void StartDecrypting(void);
diff --git a/device.h b/device.h
index 2d4edeca..e2ff8126 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.h 2.29 2011/10/16 14:10:33 kls Exp $
+ * $Id: device.h 2.30 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __DEVICE_H
@@ -472,7 +472,7 @@ protected:
///< Sets the current subtitle track to the given value.
public:
void ClrAvailableTracks(bool DescriptionsOnly = false, bool IdsOnly = false);
- ///< Clears the list of currently availabe tracks. If DescriptionsOnly
+ ///< Clears the list of currently available tracks. If DescriptionsOnly
///< is true, only the track descriptions will be cleared. With IdsOnly
///< set to true only the ids will be cleared. IdsOnly is only taken
///< into account if DescriptionsOnly is false.
@@ -665,10 +665,10 @@ public:
///< Returns true if the device itself or any of the file handles in
///< Poller is ready for further action.
///< If TimeoutMs is not zero, the device will wait up to the given number
- ///< of milleseconds before returning in case it can't accept any data.
+ ///< of milliseconds before returning in case it can't accept any data.
virtual bool Flush(int TimeoutMs = 0);
///< Returns true if the device's output buffers are empty, i. e. any
- ///< data which was bufferd so far has been processed.
+ ///< data which was buffered so far has been processed.
///< If TimeoutMs is not zero, the device will wait up to the given
///< number of milliseconds before returning in case there is still
///< data in the buffers.
diff --git a/dvbdevice.h b/dvbdevice.h
index aee74592..2072ab20 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.h 2.17 2011/11/27 11:56:57 kls Exp $
+ * $Id: dvbdevice.h 2.18 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __DVBDEVICE_H
@@ -203,7 +203,7 @@ public:
protected:
static int setTransferModeForDolbyDigital;
public:
- static void SetTransferModeForDolbyDigital(int Mode); // needs to be here for backwards compatibilty
+ static void SetTransferModeForDolbyDigital(int Mode); // needs to be here for backwards compatibility
///< Controls how the DVB device handles Transfer Mode when replaying
///< Dolby Digital audio.
///< 0 = don't set "audio bypass" in driver/firmware, don't force Transfer Mode
diff --git a/font.h b/font.h
index dbca88ef..8e734ace 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: font.h 2.5 2011/01/14 16:22:03 kls Exp $
+ * $Id: font.h 2.6 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __FONT_H
@@ -51,7 +51,7 @@ public:
virtual int Height(void) const = 0;
///< Returns the height of this font in pixel (all characters have the same height).
int Height(const char *s) const { return Height(); }
- ///< Returns the height of this font in pixel (obsolete, just for backwards compatibilty).
+ ///< Returns the height of this font in pixel (obsolete, just for backwards compatibility).
virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const = 0;
///< Draws the given text into the Bitmap at position (x, y) with the given colors.
///< The text will not exceed the given Width (if > 0), and will end with a complete character.
diff --git a/osd.h b/osd.h
index ab10e42b..f5f8b656 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.h 2.14 2011/08/15 09:22:50 kls Exp $
+ * $Id: osd.h 2.15 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __OSD_H
@@ -496,7 +496,7 @@ public:
///< In order to allow devices that can handle only a limited number of layers,
///< the Layer parameter must be less than 8 (MAXPIXMAPLAYERS).
///< ViewPort defines the rectangle in which this pixmap will be rendered on
- ///< the OSD. If no DrawPort ist given, it defaults to the same size as the
+ ///< the OSD. If no DrawPort is given, it defaults to the same size as the
///< ViewPort, with its upper left corner set to (0, 0).
///< All drawing operations will be executed relative to the origin of the
///< DrawPort rectangle, and will be clipped to the size of this rectangle.
@@ -566,7 +566,7 @@ public:
///< Sets the pixmap's draw port to the given Point.
///< Only the origin point of the draw port can be modified, its size is fixed.
///< By default, setting a new draw port point results in marking the relevant
- ///< part of the view port as "drity". If Dirty is set to false, the view port
+ ///< part of the view port as "dirty". If Dirty is set to false, the view port
///< will not be marked as dirty. This is mainly used to implement the Pan()
///< function.
///< If a derived class reimplements this function, it needs to call the base
@@ -701,7 +701,7 @@ public:
/// reimplement all necessary cPixmap functions and do the rendering
/// itself ("high level mode").
/// If an OSD provides a "high level mode", it shall also provide a "raw mode"
-/// in order to verify proper operation. The plugin that impements the OSD
+/// in order to verify proper operation. The plugin that implements the OSD
/// shall offer a configuration switch in its setup.
class cOsd {
diff --git a/pat.h b/pat.h
index b516b903..cffb5a28 100644
--- a/pat.h
+++ b/pat.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: pat.h 2.1 2009/08/15 22:16:00 kls Exp $
+ * $Id: pat.h 2.2 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __PAT_H
@@ -39,7 +39,7 @@ int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSy
///< are copied that match one of the given CA system IDs.
///< \return Returns the number of bytes copied into Data (0 if no CA descriptors are
///< available), or -1 if BufSize was too small to hold all CA descriptors.
- ///< The return value in StreamFlag tells whether these CA descriptors are to be used
+ ///< The return value tells whether these CA descriptors are to be used
///< for the individual streams.
#endif //__PAT_H
diff --git a/receiver.h b/receiver.h
index bd98a426..a5223ab7 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: receiver.h 2.1 2010/01/30 10:25:19 kls Exp $
+ * $Id: receiver.h 2.2 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __RECEIVER_H
@@ -56,7 +56,7 @@ public:
bool AddPid(int Pid);
///< Adds the given Pid to the list of PIDs of this receiver.
bool AddPids(const int *Pids);
- ///< Adds the given izero terminated list of Pids to the list of PIDs of this
+ ///< Adds the given zero terminated list of Pids to the list of PIDs of this
///< receiver.
bool AddPids(int Pid1, int Pid2, int Pid3 = 0, int Pid4 = 0, int Pid5 = 0, int Pid6 = 0, int Pid7 = 0, int Pid8 = 0, int Pid9 = 0);
///< Adds the given Pids to the list of PIDs of this receiver.
diff --git a/recording.h b/recording.h
index 37979ec6..d3dbd1da 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 2.25 2011/08/21 13:10:39 kls Exp $
+ * $Id: recording.h 2.26 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __RECORDING_H
@@ -176,7 +176,7 @@ public:
///< Triggers an update of the list of recordings, which will run
///< as a separate thread if Wait is false. If Wait is true, the
///< function returns only after the update has completed.
- ///< Returns true if Wait is true and there is anyting in the list
+ ///< Returns true if Wait is true and there is anything in the list
///< of recordings, false otherwise.
void TouchUpdate(void);
///< Touches the '.update' file in the video directory, so that other
@@ -292,7 +292,7 @@ public:
bool IsStillRecording(void);
void Delete(void);
static int GetLength(const char *FileName, bool IsPesRecording = false);
- ///< Calculates the recording length (numer of frames) without actually reading the index file.
+ ///< Calculates the recording length (number of frames) without actually reading the index file.
///< Returns -1 in case of error.
};
diff --git a/ringbuffer.h b/ringbuffer.h
index 9fe33771..d234502d 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: ringbuffer.h 2.2 2009/11/21 15:55:34 kls Exp $
+ * $Id: ringbuffer.h 2.3 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __RINGBUFFER_H
@@ -85,7 +85,7 @@ public:
///< \return Returns the number of bytes actually read and stored, or
///< an error value from the actual read() call.
int Read(cUnbufferedFile *File, int Max = 0);
- ///< Like Read(int FileHandle, int Max), but reads fom a cUnbufferedFile).
+ ///< Like Read(int FileHandle, int Max), but reads from a cUnbufferedFile).
int Put(const uchar *Data, int Count);
///< Puts at most Count bytes of Data into the ring buffer.
///< \return Returns the number of bytes actually stored.
diff --git a/skins.h b/skins.h
index 9e83c0ca..280a8e23 100644
--- a/skins.h
+++ b/skins.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: skins.h 1.16 2008/02/17 11:30:56 kls Exp $
+ * $Id: skins.h 2.1 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __SKINS_H
@@ -148,7 +148,7 @@ public:
///< Sets the Total number of items in the currently displayed list, and the
///< Offset of the first item that is currently displayed (the skin knows how
///< many items it can display at once, see MaxItems()). This can be used to
- ///< display a scollbar.
+ ///< display a scrollbar.
virtual void SetEvent(const cEvent *Event) = 0;
///< Sets the Event that shall be displayed, using the entire central area
///< of the menu. The Event's 'description' shall be displayed using a
diff --git a/tools.h b/tools.h
index bcc6f171..5b436fd4 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 2.12 2011/09/18 11:21:23 kls Exp $
+ * $Id: tools.h 2.13 2011/12/04 13:38:17 kls Exp $
*/
#ifndef __TOOLS_H
@@ -108,7 +108,7 @@ int Utf8StrLen(const char *s);
///< Returns the number of UTF-8 symbols formed by the given string of
///< character bytes.
char *Utf8Strn0Cpy(char *Dest, const char *Src, int n);
- ///< Copies at most n character bytes from Src to Dst, making sure that the
+ ///< Copies at most n character bytes from Src to Dest, making sure that the
///< resulting copy ends with a complete UTF-8 symbol. The copy is guaranteed
///< to be zero terminated.
///< Returns a pointer to Dest.
@@ -210,7 +210,7 @@ int64_t StrToNum(const char *s);
///< The numerical part of the string may be followed by one of the letters
///< K, M, G or T to abbreviate Kilo-, Mega-, Giga- or Terabyte, respectively
///< (based on 1024). Everything after the first non-numeric character is
- ///< silently ignored, as are any characters other than the ones mentionend here.
+ ///< silently ignored, as are any characters other than the ones mentioned here.
cString itoa(int n);
cString AddDirectory(const char *DirName, const char *FileName);
bool EntriesOnSameFileSystem(const char *File1, const char *File2);