class cMyDeviceHook : public cDeviceHook {
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
index f9ff5b32..4e98cdda 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: dvbsdffdevice.c 2.34 2013/01/25 10:48:29 kls Exp $
+ * $Id: dvbsdffdevice.c 2.35 2013/02/17 13:16:18 kls Exp $
*/
#include "dvbsdffdevice.h"
@@ -795,5 +795,5 @@ bool cDvbSdFfDeviceProbe::Probe(int Adapter, int Frontend)
return true;
}
}
- return false;
+ return false;
}
diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
index dc55148f..bbf2ec21 100644
--- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
+++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.h
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: dvbsdffdevice.h 2.15 2013/01/25 10:43:14 kls Exp $
+ * $Id: dvbsdffdevice.h 2.16 2013/02/17 13:16:29 kls Exp $
*/
#ifndef __DVBSDFFDEVICE_H
@@ -112,5 +112,5 @@ public:
void SetOutputOnly(bool On) { outputOnly = On; }
virtual bool Probe(int Adapter, int Frontend);
};
-
+
#endif //__DVBSDFFDEVICE_H
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index c25d5763..0d289e89 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: osddemo.c 2.9 2013/02/13 13:46:31 kls Exp $
+ * $Id: osddemo.c 2.10 2013/02/17 13:16:34 kls Exp $
*/
#include
@@ -335,7 +335,7 @@ void cTrueColorDemo::Action(void)
State++;
}
break;
- case 1: {
+ case 1: {
FadeInPixmap = CreateTextPixmap("Video Disk Recorder", Line, 3, clrYellow, clrTransparent, OsdFont);
if (FadeInPixmap)
Line += FadeInPixmap->DrawPort().Height();
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 2895ca8c..2ba8de78 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,7 +7,7 @@
#
# See the README file for copyright information and how to reach the author.
#
-# $Id: pic2mpg 2.4 2012/01/08 13:27:17 kls Exp $
+# $Id: pic2mpg 2.5 2013/02/17 13:17:13 kls Exp $
use File::Path;
use File::Spec;
@@ -37,9 +37,9 @@ $Verbose = $opt_v;
$ListFiles = $Verbose >= 1;
$Detailed = $Verbose >= 2;
-# Supported picture types:
+# Supported picture types:
-%PICTYPES = (
+%PICTYPES = (
bmp => 1,
gif => 1,
jpeg => 1,
@@ -135,7 +135,7 @@ sub ConvertFile
return if (!defined $PICTYPES{$Type});
my $Exif = ImageInfo($Pict);
my $Orientation = $$Exif{"Orientation"};
- my ($Degrees) = $Orientation =~ /Rotate ([0-9]+)/;
+ my ($Degrees) = $Orientation =~ /Rotate ([0-9]+)/;
my $Rotate = $Degrees ? "-rotate $Degrees" : "";
print "orientation = '$Orientation' -> rotation = $Rotate\n" if ($Detailed);
$Pict = EscapeMeta($Pict);
diff --git a/README b/README
index 9a1efb8f..116385ec 100644
--- a/README
+++ b/README
@@ -36,5 +36,5 @@ the ones in this system, but here we have the full source code
and can modify the menus in whatever way desired.
-"VDR Video Disk Recorder" is a registered trademark of Klaus Schmidinger.
-"TVDR TV Done Right" is a registered trademark of Klaus Schmidinger.
+"VDR Video Disk Recorder" is a registered trademark of Klaus Schmidinger.
+"TVDR TV Done Right" is a registered trademark of Klaus Schmidinger.
diff --git a/ci.c b/ci.c
index 834647bb..9a4a8295 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: ci.c 2.11 2013/02/16 15:16:14 kls Exp $
+ * $Id: ci.c 2.12 2013/02/17 13:17:28 kls Exp $
*/
#include "ci.h"
@@ -1936,7 +1936,7 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel)
for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE);
for (const int *Spid = Channel->Spids(); *Spid; Spid++)
- CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE);
+ CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE);
cas->SendPMT(&CaPmt);
cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
do {
diff --git a/dvbdevice.c b/dvbdevice.c
index 05a70962..7007ad64 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 2.79 2013/02/16 12:47:59 kls Exp $
+ * $Id: dvbdevice.c 2.80 2013/02/17 13:17:33 kls Exp $
*/
#include "dvbdevice.h"
@@ -659,7 +659,7 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
}
static cMutex Mutex;
if (Diseqc->IsScr())
- Mutex.Lock();
+ Mutex.Lock();
struct dvb_diseqc_master_cmd cmd;
const char *CurrentAction = NULL;
for (;;) {
@@ -681,7 +681,7 @@ void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
if (scr)
ResetToneAndVoltage(); // makes sure we don't block the bus!
if (Diseqc->IsScr())
- Mutex.Unlock();
+ Mutex.Unlock();
}
void cDvbTuner::ResetToneAndVoltage(void)
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 99550697..3ce1a3e8 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
* Original author: Marco Schluessler
* With some input from the "subtitle plugin" by Pekka Virtanen
*
- * $Id: dvbsubtitle.c 2.32 2012/05/08 08:17:17 kls Exp $
+ * $Id: dvbsubtitle.c 2.33 2013/02/17 13:17:38 kls Exp $
*/
@@ -1283,7 +1283,7 @@ void cDvbSubtitleConverter::FinishPage(cDvbSubtitlePage *Page)
}
cDvbSubtitleBitmaps *Bitmaps = new cDvbSubtitleBitmaps(Page->Pts(), Page->Timeout(), Areas, NumAreas, osdFactorX, osdFactorY);
bitmaps->Add(Bitmaps);
- for (int i = 0; i < NumAreas; i++) {
+ for (int i = 0; i < NumAreas; i++) {
cSubtitleRegion *sr = Page->regions.Get(i);
cSubtitleClut *clut = Page->GetClutById(sr->ClutId());
if (!clut)
diff --git a/font.h b/font.h
index 8e734ace..86bd8b33 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.6 2011/12/04 13:38:17 kls Exp $
+ * $Id: font.h 2.7 2013/02/17 13:17:42 kls Exp $
*/
#ifndef __FONT_H
@@ -43,7 +43,7 @@ public:
///< Returns the font name.
virtual int Size(void) const { return Height(); }
///< Returns the original size as requested when the font was created.
- ///< This may be different than the actual height.
+ ///< This may be different than the actual height.
virtual int Width(uint c) const = 0;
///< Returns the width of the given character in pixel.
virtual int Width(const char *s) const = 0;
diff --git a/menu.c b/menu.c
index 25ffb2cc..69fe6d50 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 2.78 2013/02/12 13:10:53 kls Exp $
+ * $Id: menu.c 2.79 2013/02/17 13:17:49 kls Exp $
*/
#include "menu.h"
@@ -2811,7 +2811,7 @@ cMenuSetupDVB::cMenuSetupDVB(void)
standardComplianceTexts[1] = "ANSI/SCTE";
SetSection(tr("DVB"));
- SetHelp(NULL, tr("Button$Audio"), tr("Button$Subtitles"), NULL);
+ SetHelp(NULL, tr("Button$Audio"), tr("Button$Subtitles"), NULL);
Setup();
}
@@ -2865,7 +2865,7 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
case kYellow: cRemote::Put(kSubtitles, true);
state = osEnd;
break;
- default: {
+ default: {
bool DoSetup = data.VideoFormat != newVideoFormat;
DoSetup |= data.DisplaySubtitles != newDisplaySubtitles;
if (numAudioLanguages != oldnumAudioLanguages) {
@@ -4961,7 +4961,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
else
Show();
break;
- case kBack: if (Setup.DelTimeshiftRec) {
+ case kBack: if (Setup.DelTimeshiftRec) {
cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
return rc && rc->InstantId() ? osEnd : osRecordings;
}
diff --git a/recording.c b/recording.c
index 0849fe12..3359de36 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: recording.c 2.87 2013/02/11 11:18:22 kls Exp $
+ * $Id: recording.c 2.88 2013/02/17 13:17:55 kls Exp $
*/
#include "recording.h"
@@ -1103,7 +1103,7 @@ bool cRecording::WriteInfo(void)
return true;
}
-void cRecording::SetStartTime(time_t Start)
+void cRecording::SetStartTime(time_t Start)
{
start = Start;
free(fileName);
@@ -2136,7 +2136,7 @@ int cIndexFile::GetLength(const char *FileName, bool IsPesRecording)
return -1;
}
-bool GenerateIndex(const char *FileName)
+bool GenerateIndex(const char *FileName)
{
if (DirectoryOk(FileName)) {
cRecording Recording(FileName);
diff --git a/remux.c b/remux.c
index 38ad2468..9be30788 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: remux.c 2.73 2012/11/25 14:16:11 kls Exp $
+ * $Id: remux.c 2.74 2013/02/17 13:17:58 kls Exp $
*/
#include "remux.h"
@@ -1244,7 +1244,7 @@ int cH264Parser::Parse(const uchar *Data, int Length, int Pid)
break;
case nutCodedSliceNonIdr:
case nutCodedSliceIdr: if (gotAccessUnitDelimiter && gotSequenceParameterSet) {
- ParseSliceHeader();
+ ParseSliceHeader();
gotAccessUnitDelimiter = false;
return tsPayload.Used();
}
diff --git a/svdrp.c b/svdrp.c
index 1ab8ee59..8a50daeb 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection.
*
- * $Id: svdrp.c 2.23 2013/01/17 15:19:02 kls Exp $
+ * $Id: svdrp.c 2.24 2013/02/17 13:18:01 kls Exp $
*/
#include "svdrp.h"
@@ -1512,7 +1512,7 @@ void cSVDRP::CmdPUTE(const char *Option)
else
Reply(501, "Cannot open file \"%s\"", Option);
}
- else {
+ else {
delete PUTEhandler;
PUTEhandler = new cPUTEhandler;
Reply(PUTEhandler->Status(), "%s", PUTEhandler->Message());
diff --git a/tools.h b/tools.h
index 70c643fc..d6a778e6 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.23 2012/12/06 08:59:39 kls Exp $
+ * $Id: tools.h 2.24 2013/02/17 13:18:06 kls Exp $
*/
#ifndef __TOOLS_H
@@ -45,7 +45,7 @@ extern int SysLogLevel;
#define MALLOC(type, size) (type *)malloc(sizeof(type) * (size))
-template inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q; }
+template inline void DELETENULL(T *&p) { T *q = p; p = NULL; delete q; }
#define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
#define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
|