mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Cleaned up some trailing white space
This commit is contained in:
parent
dcda6676b3
commit
2d863532cc
15
HISTORY
15
HISTORY
@ -1491,9 +1491,9 @@ Video Disk Recorder Revision History
|
|||||||
--- Makefile 2002/06/10 16:24:06 1.4
|
--- Makefile 2002/06/10 16:24:06 1.4
|
||||||
+++ Makefile 2002/09/17 15:36:36 1.5
|
+++ Makefile 2002/09/17 15:36:36 1.5
|
||||||
@@ -15,7 +15,12 @@
|
@@ -15,7 +15,12 @@
|
||||||
|
|
||||||
### The directory environment:
|
### The directory environment:
|
||||||
|
|
||||||
+ifdef NEWSTRUCT
|
+ifdef NEWSTRUCT
|
||||||
+DVBDIR = ../../../../DVB/include
|
+DVBDIR = ../../../../DVB/include
|
||||||
+DEFINES += -DNEWSTRUCT
|
+DEFINES += -DNEWSTRUCT
|
||||||
@ -1504,12 +1504,12 @@ Video Disk Recorder Revision History
|
|||||||
VDRINC = $(VDRDIR)/include
|
VDRINC = $(VDRDIR)/include
|
||||||
LIBDIR = ../../lib
|
LIBDIR = ../../lib
|
||||||
@@ -34,7 +39,7 @@
|
@@ -34,7 +39,7 @@
|
||||||
|
|
||||||
INCLUDES = -I$(VDRINC) -I$(DVBDIR)
|
INCLUDES = -I$(VDRINC) -I$(DVBDIR)
|
||||||
|
|
||||||
-DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
-DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
||||||
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
||||||
|
|
||||||
### The object files (add further files here):
|
### The object files (add further files here):
|
||||||
-------------------------------------------------------
|
-------------------------------------------------------
|
||||||
|
|
||||||
@ -2705,7 +2705,7 @@ Video Disk Recorder Revision History
|
|||||||
- Timers can now be set to use the VPS information to control recording a programme.
|
- Timers can now be set to use the VPS information to control recording a programme.
|
||||||
The new setup options "Recording/Use VPS" and "Recording/VPS margin", as well as
|
The new setup options "Recording/Use VPS" and "Recording/VPS margin", as well as
|
||||||
the "VPS" option in the individual timers, can be used to control this feature
|
the "VPS" option in the individual timers, can be used to control this feature
|
||||||
(see MANUAL for details).
|
(see MANUAL for details).
|
||||||
Note that this feature will certainly need a lot of testing before it can be
|
Note that this feature will certainly need a lot of testing before it can be
|
||||||
called "safe"!
|
called "safe"!
|
||||||
- The "Schedule" and "What's on now/next?" menus now have an additional column
|
- The "Schedule" and "What's on now/next?" menus now have an additional column
|
||||||
@ -3270,7 +3270,7 @@ Video Disk Recorder Revision History
|
|||||||
botton left side.
|
botton left side.
|
||||||
- The new setup option "DVB/Audio languages" can be used to control which audio
|
- The new setup option "DVB/Audio languages" can be used to control which audio
|
||||||
language shall be selected in case a channel broadcasts in different languages
|
language shall be selected in case a channel broadcasts in different languages
|
||||||
(see MANUAL for details).
|
(see MANUAL for details).
|
||||||
- The "Left" and "Right" keys in the "Audio" menu can be used to switch between
|
- The "Left" and "Right" keys in the "Audio" menu can be used to switch between
|
||||||
the left and right stereo channels in case there are different audio tracks
|
the left and right stereo channels in case there are different audio tracks
|
||||||
in these channels (see MANUAL for details).
|
in these channels (see MANUAL for details).
|
||||||
@ -4133,3 +4133,4 @@ Video Disk Recorder Revision History
|
|||||||
(thanks to Reinhard Nissl).
|
(thanks to Reinhard Nissl).
|
||||||
- Added a SleepMs() in cRecorder::Action() to avoid a busy loop (thanks to Ingo
|
- Added a SleepMs() in cRecorder::Action() to avoid a busy loop (thanks to Ingo
|
||||||
Schneider).
|
Schneider).
|
||||||
|
- Cleaned up some trailing white space.
|
||||||
|
@ -518,7 +518,7 @@ virtual void Stop(void);
|
|||||||
|
|
||||||
in which it shall stop them.
|
in which it shall stop them.
|
||||||
<p>
|
<p>
|
||||||
The <tt>Stop()</tt> function will only be called if a previous call to the
|
The <tt>Stop()</tt> function will only be called if a previous call to the
|
||||||
<a href="#Getting started"><tt>Start()</tt></a> function of that plugin has
|
<a href="#Getting started"><tt>Start()</tt></a> function of that plugin has
|
||||||
returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
|
returned <i>true</i>. The <tt>Stop()</tt> functions are called in the reverse order
|
||||||
as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
|
as the <a href="#Getting started"><tt>Start()</tt></a> functions were called.
|
||||||
|
4
device.c
4
device.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: device.c 1.120 2006/01/08 10:11:42 kls Exp $
|
* $Id: device.c 1.121 2006/01/08 11:39:37 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "device.h"
|
#include "device.h"
|
||||||
@ -1010,7 +1010,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
|
|||||||
uchar SubStreamId = Data[PayloadOffset];
|
uchar SubStreamId = Data[PayloadOffset];
|
||||||
uchar SubStreamType = SubStreamId & 0xF0;
|
uchar SubStreamType = SubStreamId & 0xF0;
|
||||||
uchar SubStreamIndex = SubStreamId & 0x1F;
|
uchar SubStreamIndex = SubStreamId & 0x1F;
|
||||||
|
|
||||||
// Compatibility mode for old VDR recordings, where 0xBD was only AC3:
|
// Compatibility mode for old VDR recordings, where 0xBD was only AC3:
|
||||||
pre_1_3_19_PrivateStreamDeteced:
|
pre_1_3_19_PrivateStreamDeteced:
|
||||||
if (pre_1_3_19_PrivateStream) {
|
if (pre_1_3_19_PrivateStream) {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: dvbplayer.c 1.41 2005/10/31 12:33:48 kls Exp $
|
* $Id: dvbplayer.c 1.42 2006/01/08 11:39:41 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dvbplayer.h"
|
#include "dvbplayer.h"
|
||||||
@ -621,7 +621,7 @@ int cDvbPlayer::SkipFrames(int Frames)
|
|||||||
int Current, Total;
|
int Current, Total;
|
||||||
GetIndex(Current, Total, true);
|
GetIndex(Current, Total, true);
|
||||||
int OldCurrent = Current;
|
int OldCurrent = Current;
|
||||||
// As GetNextIFrame() increments/decrements at least once, the
|
// As GetNextIFrame() increments/decrements at least once, the
|
||||||
// destination frame (= Current + Frames) must be adjusted by
|
// destination frame (= Current + Frames) must be adjusted by
|
||||||
// -1/+1 respectively.
|
// -1/+1 respectively.
|
||||||
Current = index->GetNextIFrame(Current + Frames + (Frames > 0 ? -1 : 1), Frames > 0);
|
Current = index->GetNextIFrame(Current + Frames + (Frames > 0 ? -1 : 1), Frames > 0);
|
||||||
|
6
dvbspu.c
6
dvbspu.c
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
* parts of this file are derived from the OMS program.
|
* parts of this file are derived from the OMS program.
|
||||||
*
|
*
|
||||||
* $Id: dvbspu.c 1.18 2006/01/05 10:18:21 kls Exp $
|
* $Id: dvbspu.c 1.19 2006/01/08 11:39:46 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dvbspu.h"
|
#include "dvbspu.h"
|
||||||
@ -27,7 +27,7 @@
|
|||||||
* Inputs:
|
* Inputs:
|
||||||
* - a SPU rle encoded image on creation, which will be decoded into
|
* - a SPU rle encoded image on creation, which will be decoded into
|
||||||
* the full screen indexed bitmap
|
* the full screen indexed bitmap
|
||||||
*
|
*
|
||||||
* Output:
|
* Output:
|
||||||
* - a minimal sized cDvbSpuBitmap a given palette, the indexed bitmap
|
* - a minimal sized cDvbSpuBitmap a given palette, the indexed bitmap
|
||||||
* will be scanned to get the smallest possible resulting bitmap considering
|
* will be scanned to get the smallest possible resulting bitmap considering
|
||||||
@ -435,7 +435,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
|
|||||||
|
|
||||||
prev_DCSQ_offset = DCSQ_offset;
|
prev_DCSQ_offset = DCSQ_offset;
|
||||||
DCSQ_offset = spuU32(i);
|
DCSQ_offset = spuU32(i);
|
||||||
DEBUG("offs = %d, DCSQ = %d, prev_DCSQ = %d\n",
|
DEBUG("offs = %d, DCSQ = %d, prev_DCSQ = %d\n",
|
||||||
i, DCSQ_offset, prev_DCSQ_offset);
|
i, DCSQ_offset, prev_DCSQ_offset);
|
||||||
i += 2;
|
i += 2;
|
||||||
|
|
||||||
|
@ -154,9 +154,9 @@ SuckGlyphsFromServer(Display * dpy, Font font)
|
|||||||
character.byte2 = (i + fontinfo->min_char_or_byte2) & 255;
|
character.byte2 = (i + fontinfo->min_char_or_byte2) & 255;
|
||||||
character.byte1 = (i + fontinfo->min_char_or_byte2) >> 8;
|
character.byte1 = (i + fontinfo->min_char_or_byte2) >> 8;
|
||||||
|
|
||||||
/* XXX we could use XDrawImageString16 which would also paint the backing
|
/* XXX we could use XDrawImageString16 which would also paint the backing
|
||||||
|
|
||||||
rectangle but X server bugs in some scalable font rasterizers makes it
|
rectangle but X server bugs in some scalable font rasterizers makes it
|
||||||
|
|
||||||
more effective to do XFillRectangles to clear the pixmap and
|
more effective to do XFillRectangles to clear the pixmap and
|
||||||
XDrawImage16 for the text. */
|
XDrawImage16 for the text. */
|
||||||
|
8
menu.c
8
menu.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: menu.c 1.389 2006/01/07 15:38:16 kls Exp $
|
* $Id: menu.c 1.390 2006/01/08 11:39:57 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "menu.h"
|
#include "menu.h"
|
||||||
@ -1104,7 +1104,7 @@ eOSState cMenuWhatsOn::Record(void)
|
|||||||
timer = t;
|
timer = t;
|
||||||
return AddSubMenu(new cMenuEditTimer(timer));
|
return AddSubMenu(new cMenuEditTimer(timer));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Timers.Add(timer);
|
Timers.Add(timer);
|
||||||
timer->Matches();
|
timer->Matches();
|
||||||
Timers.SetModified();
|
Timers.SetModified();
|
||||||
@ -1258,7 +1258,7 @@ eOSState cMenuSchedule::Record(void)
|
|||||||
timer = t;
|
timer = t;
|
||||||
return AddSubMenu(new cMenuEditTimer(timer));
|
return AddSubMenu(new cMenuEditTimer(timer));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Timers.Add(timer);
|
Timers.Add(timer);
|
||||||
timer->Matches();
|
timer->Matches();
|
||||||
Timers.SetModified();
|
Timers.SetModified();
|
||||||
@ -2047,7 +2047,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
|
|||||||
themeIndex = d ? themes.GetThemeIndex(d) : 0;
|
themeIndex = d ? themes.GetThemeIndex(d) : 0;
|
||||||
free(d);
|
free(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
Set();
|
Set();
|
||||||
Setup.OSDLanguage = OriginalOSDLanguage;
|
Setup.OSDLanguage = OriginalOSDLanguage;
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: osdbase.c 1.27 2006/01/05 15:35:06 kls Exp $
|
* $Id: osdbase.c 1.28 2006/01/08 11:40:02 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "osdbase.h"
|
#include "osdbase.h"
|
||||||
@ -161,10 +161,10 @@ void cOsdMenu::Del(int Index)
|
|||||||
{
|
{
|
||||||
cList<cOsdItem>::Del(Get(Index));
|
cList<cOsdItem>::Del(Get(Index));
|
||||||
int count = Count();
|
int count = Count();
|
||||||
while (current < count && !SelectableItem(current))
|
while (current < count && !SelectableItem(current))
|
||||||
current++;
|
current++;
|
||||||
if (current == count) {
|
if (current == count) {
|
||||||
while (current > 0 && !SelectableItem(current))
|
while (current > 0 && !SelectableItem(current))
|
||||||
current--;
|
current--;
|
||||||
}
|
}
|
||||||
if (Index == first && first > 0)
|
if (Index == first && first > 0)
|
||||||
@ -371,7 +371,7 @@ void cOsdMenu::PageUp(void)
|
|||||||
CursorUp();
|
CursorUp();
|
||||||
}
|
}
|
||||||
|
|
||||||
void cOsdMenu::PageDown(void)
|
void cOsdMenu::PageDown(void)
|
||||||
{
|
{
|
||||||
int oldCurrent = current;
|
int oldCurrent = current;
|
||||||
int oldFirst = first;
|
int oldFirst = first;
|
||||||
|
4
plugin.c
4
plugin.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: plugin.c 1.15 2005/08/27 16:13:24 kls Exp $
|
* $Id: plugin.c 1.16 2006/01/08 11:40:05 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "plugin.h"
|
#include "plugin.h"
|
||||||
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
char *cPlugin::configDirectory = NULL;
|
char *cPlugin::configDirectory = NULL;
|
||||||
|
|
||||||
cPlugin::cPlugin(void)
|
cPlugin::cPlugin(void)
|
||||||
{
|
{
|
||||||
name = NULL;
|
name = NULL;
|
||||||
started = false;
|
started = false;
|
||||||
|
6
rcu.c
6
rcu.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: rcu.c 1.12 2005/12/31 15:09:32 kls Exp $
|
* $Id: rcu.c 1.13 2006/01/08 11:40:09 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "rcu.h"
|
#include "rcu.h"
|
||||||
@ -230,7 +230,7 @@ void cRcuRemote::SetMode(unsigned char Mode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool cRcuRemote::SendCommand(unsigned char Cmd)
|
bool cRcuRemote::SendCommand(unsigned char Cmd)
|
||||||
{
|
{
|
||||||
return SendByte(Cmd | 0x80);
|
return SendByte(Cmd | 0x80);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -274,7 +274,7 @@ void cRcuRemote::SetString(char *s)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cRcuRemote::SetPoints(unsigned char Dp, bool On)
|
void cRcuRemote::SetPoints(unsigned char Dp, bool On)
|
||||||
{
|
{
|
||||||
if (On)
|
if (On)
|
||||||
dp |= Dp;
|
dp |= Dp;
|
||||||
else
|
else
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: recording.c 1.131 2006/01/03 11:36:12 kls Exp $
|
* $Id: recording.c 1.132 2006/01/08 11:40:13 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "recording.h"
|
#include "recording.h"
|
||||||
@ -550,7 +550,7 @@ cRecording::cRecording(const char *FileName)
|
|||||||
// so assume the short text is missing and concatenate
|
// so assume the short text is missing and concatenate
|
||||||
// line 1 and line 2 to be the long text:
|
// line 1 and line 2 to be the long text:
|
||||||
int len = strlen(data[1]);
|
int len = strlen(data[1]);
|
||||||
if (len > 80) {
|
if (len > 80) {
|
||||||
data[1] = (char *)realloc(data[1], len + 1 + strlen(data[2]) + 1);
|
data[1] = (char *)realloc(data[1], len + 1 + strlen(data[2]) + 1);
|
||||||
strcat(data[1], "\n");
|
strcat(data[1], "\n");
|
||||||
strcat(data[1], data[2]);
|
strcat(data[1], data[2]);
|
||||||
|
4
remux.c
4
remux.c
@ -11,7 +11,7 @@
|
|||||||
* The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
|
* The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
|
||||||
* and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
|
* and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
|
||||||
*
|
*
|
||||||
* $Id: remux.c 1.52 2006/01/03 10:55:45 kls Exp $
|
* $Id: remux.c 1.53 2006/01/08 11:40:16 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "remux.h"
|
#include "remux.h"
|
||||||
@ -746,7 +746,7 @@ void cAudioRepacker::Repack(cRingBufferLinear *ResultBuffer, const uchar *Data,
|
|||||||
payload = data;
|
payload = data;
|
||||||
// maximum we can hold in one PES packet
|
// maximum we can hold in one PES packet
|
||||||
packetTodo = maxPacketSize - pesHeaderLen;
|
packetTodo = maxPacketSize - pesHeaderLen;
|
||||||
// expected remainder of audio frame: so far we have read 3 bytes from the frame header
|
// expected remainder of audio frame: so far we have read 3 bytes from the frame header
|
||||||
frameTodo = frameSize - 3;
|
frameTodo = frameSize - 3;
|
||||||
// go on with collecting the frame's data
|
// go on with collecting the frame's data
|
||||||
state++;
|
state++;
|
||||||
|
4
skins.c
4
skins.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: skins.c 1.6 2005/11/27 15:52:25 kls Exp $
|
* $Id: skins.c 1.7 2006/01/08 11:40:18 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "skins.h"
|
#include "skins.h"
|
||||||
@ -323,7 +323,7 @@ void cSkins::ProcessQueuedMessages(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
queueMessageMutex.Unlock();
|
queueMessageMutex.Unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
4
skins.h
4
skins.h
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: skins.h 1.9 2005/11/27 15:41:44 kls Exp $
|
* $Id: skins.h 1.10 2006/01/08 11:40:21 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __SKINS_H
|
#ifndef __SKINS_H
|
||||||
@ -197,7 +197,7 @@ public:
|
|||||||
///< take care that it is erased from the display when a Current string
|
///< take care that it is erased from the display when a Current string
|
||||||
///< _with_ ".ff" is followed by one without it.
|
///< _with_ ".ff" is followed by one without it.
|
||||||
virtual void SetTotal(const char *Total) = 0;
|
virtual void SetTotal(const char *Total) = 0;
|
||||||
///< Sets the total length of the recording, as a user readable
|
///< Sets the total length of the recording, as a user readable
|
||||||
///< string if the form "h:mm:ss".
|
///< string if the form "h:mm:ss".
|
||||||
virtual void SetJump(const char *Jump) = 0;
|
virtual void SetJump(const char *Jump) = 0;
|
||||||
///< Sets the prompt that allows the user to enter a jump point.
|
///< Sets the prompt that allows the user to enter a jump point.
|
||||||
|
4
thread.h
4
thread.h
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: thread.h 1.35 2006/01/04 14:58:16 kls Exp $
|
* $Id: thread.h 1.36 2006/01/08 11:40:23 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __THREAD_H
|
#ifndef __THREAD_H
|
||||||
@ -107,7 +107,7 @@ public:
|
|||||||
cThread(const char *Description = NULL);
|
cThread(const char *Description = NULL);
|
||||||
///< Creates a new thread.
|
///< Creates a new thread.
|
||||||
///< If Description is present, a log file entry will be made when
|
///< If Description is present, a log file entry will be made when
|
||||||
///< the thread starts and stops. The Start() function must be called
|
///< the thread starts and stops. The Start() function must be called
|
||||||
///< to actually start the thread.
|
///< to actually start the thread.
|
||||||
virtual ~cThread();
|
virtual ~cThread();
|
||||||
void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3)));
|
void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3)));
|
||||||
|
6
timers.c
6
timers.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: timers.c 1.40 2006/01/06 14:14:59 kls Exp $
|
* $Id: timers.c 1.41 2006/01/08 11:40:29 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "timers.h"
|
#include "timers.h"
|
||||||
@ -464,7 +464,7 @@ void cTimer::SetInVpsMargin(bool InVpsMargin)
|
|||||||
|
|
||||||
void cTimer::SetPriority(int Priority)
|
void cTimer::SetPriority(int Priority)
|
||||||
{
|
{
|
||||||
priority = Priority;
|
priority = Priority;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cTimer::SetFlags(uint Flags)
|
void cTimer::SetFlags(uint Flags)
|
||||||
@ -620,7 +620,7 @@ void cTimers::SetEvents(void)
|
|||||||
distance = e->EndTime() - now;
|
distance = e->EndTime() - now;
|
||||||
if (Event && overlap == Overlap) {
|
if (Event && overlap == Overlap) {
|
||||||
if (Overlap > FULLMATCH) { // this means VPS
|
if (Overlap > FULLMATCH) { // this means VPS
|
||||||
if (abs(Distance) < abs(distance))
|
if (abs(Distance) < abs(distance))
|
||||||
break; // we've already found the closest VPS event
|
break; // we've already found the closest VPS event
|
||||||
}
|
}
|
||||||
else if (e->Duration() <= Event->Duration())
|
else if (e->Duration() <= Event->Duration())
|
||||||
|
10
tools.c
10
tools.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: tools.c 1.108 2006/01/05 10:41:18 kls Exp $
|
* $Id: tools.c 1.109 2006/01/08 11:40:35 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tools.h"
|
#include "tools.h"
|
||||||
@ -710,7 +710,7 @@ uchar *RgbToJpeg(uchar *Mem, int Width, int Height, int &Size, int Quality)
|
|||||||
Quality = 0;
|
Quality = 0;
|
||||||
else if (Quality > 100)
|
else if (Quality > 100)
|
||||||
Quality = 100;
|
Quality = 100;
|
||||||
|
|
||||||
jpeg_destination_mgr jdm;
|
jpeg_destination_mgr jdm;
|
||||||
|
|
||||||
jdm.init_destination = JpegCompressInitDestination;
|
jdm.init_destination = JpegCompressInitDestination;
|
||||||
@ -1284,7 +1284,7 @@ int cListObject::Index(void) const
|
|||||||
// --- cListBase -------------------------------------------------------------
|
// --- cListBase -------------------------------------------------------------
|
||||||
|
|
||||||
cListBase::cListBase(void)
|
cListBase::cListBase(void)
|
||||||
{
|
{
|
||||||
objects = lastObject = NULL;
|
objects = lastObject = NULL;
|
||||||
count = 0;
|
count = 0;
|
||||||
}
|
}
|
||||||
@ -1295,7 +1295,7 @@ cListBase::~cListBase()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cListBase::Add(cListObject *Object, cListObject *After)
|
void cListBase::Add(cListObject *Object, cListObject *After)
|
||||||
{
|
{
|
||||||
if (After && After != lastObject) {
|
if (After && After != lastObject) {
|
||||||
After->Next()->Insert(Object);
|
After->Next()->Insert(Object);
|
||||||
After->Append(Object);
|
After->Append(Object);
|
||||||
@ -1311,7 +1311,7 @@ void cListBase::Add(cListObject *Object, cListObject *After)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cListBase::Ins(cListObject *Object, cListObject *Before)
|
void cListBase::Ins(cListObject *Object, cListObject *Before)
|
||||||
{
|
{
|
||||||
if (Before && Before != objects) {
|
if (Before && Before != objects) {
|
||||||
Before->Prev()->Append(Object);
|
Before->Prev()->Append(Object);
|
||||||
Before->Insert(Object);
|
Before->Insert(Object);
|
||||||
|
4
tools.h
4
tools.h
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: tools.h 1.88 2005/12/30 11:27:23 kls Exp $
|
* $Id: tools.h 1.89 2006/01/08 11:40:37 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __TOOLS_H
|
#ifndef __TOOLS_H
|
||||||
@ -186,7 +186,7 @@ public:
|
|||||||
bool Add(int FileHandle, bool Out);
|
bool Add(int FileHandle, bool Out);
|
||||||
bool Poll(int TimeoutMs = 0);
|
bool Poll(int TimeoutMs = 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
class cReadDir {
|
class cReadDir {
|
||||||
private:
|
private:
|
||||||
DIR *directory;
|
DIR *directory;
|
||||||
|
4
vdr.1
4
vdr.1
@ -8,7 +8,7 @@
|
|||||||
.\" License as specified in the file COPYING that comes with the
|
.\" License as specified in the file COPYING that comes with the
|
||||||
.\" vdr distribution.
|
.\" vdr distribution.
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: vdr.1 1.17 2005/12/31 12:55:16 kls Exp $
|
.\" $Id: vdr.1 1.18 2006/01/08 11:44:34 kls Exp $
|
||||||
.\"
|
.\"
|
||||||
.TH vdr 1 "19 Dec 2004" "1.3.18" "Video Disk Recorder"
|
.TH vdr 1 "19 Dec 2004" "1.3.18" "Video Disk Recorder"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
@ -133,7 +133,7 @@ Run as user \fIuser\fR in case vdr was started as user 'root'.
|
|||||||
Starting vdr as 'root' is necessary if the system time shall
|
Starting vdr as 'root' is necessary if the system time shall
|
||||||
be set from the transponder data, but for security reasons
|
be set from the transponder data, but for security reasons
|
||||||
during normal operation vdr switches to a lesser privileged
|
during normal operation vdr switches to a lesser privileged
|
||||||
user id. By default the user 'vdr' is used.
|
user id. By default the user 'vdr' is used.
|
||||||
.TP
|
.TP
|
||||||
.BI \-v\ dir ,\ \-\-video= dir
|
.BI \-v\ dir ,\ \-\-video= dir
|
||||||
Use \fIdir\fR as video directory.
|
Use \fIdir\fR as video directory.
|
||||||
|
4
vdr.5
4
vdr.5
@ -8,7 +8,7 @@
|
|||||||
.\" License as specified in the file COPYING that comes with the
|
.\" License as specified in the file COPYING that comes with the
|
||||||
.\" vdr distribution.
|
.\" vdr distribution.
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: vdr.5 1.42 2006/01/07 12:30:49 kls Exp $
|
.\" $Id: vdr.5 1.43 2006/01/08 11:44:37 kls Exp $
|
||||||
.\"
|
.\"
|
||||||
.TH vdr 5 "19 Mar 2005" "1.3.38" "Video Disk Recorder Files"
|
.TH vdr 5 "19 Mar 2005" "1.3.38" "Video Disk Recorder Files"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
@ -227,7 +227,7 @@ and leave the lower 16 bit untouched.
|
|||||||
.TP
|
.TP
|
||||||
.B Channel
|
.B Channel
|
||||||
The channel to record from. This is either the channel number as shown in the
|
The channel to record from. This is either the channel number as shown in the
|
||||||
on-screen menus, or a complete channel ID. When reading \fItimers.conf\fR
|
on-screen menus, or a complete channel ID. When reading \fItimers.conf\fR
|
||||||
any channel numbers will be mapped to the respective channel ids and when
|
any channel numbers will be mapped to the respective channel ids and when
|
||||||
the file is written again, there will only be channel ids. Channel numbers
|
the file is written again, there will only be channel ids. Channel numbers
|
||||||
are accepted as input in order to allow easier creation of timers when
|
are accepted as input in order to allow easier creation of timers when
|
||||||
|
6
vdr.c
6
vdr.c
@ -22,7 +22,7 @@
|
|||||||
*
|
*
|
||||||
* The project's page is at http://www.cadsoft.de/vdr
|
* The project's page is at http://www.cadsoft.de/vdr
|
||||||
*
|
*
|
||||||
* $Id: vdr.c 1.231 2006/01/07 12:27:45 kls Exp $
|
* $Id: vdr.c 1.232 2006/01/08 11:40:41 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
@ -669,8 +669,8 @@ int main(int argc, char *argv[])
|
|||||||
&& !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
|
&& !(LastTimerChannel > 0 && Channels.SwitchTo(LastTimerChannel)) // ...or the one used by the last timer...
|
||||||
&& !cDevice::SwitchChannel(1) // ...or the next higher available one...
|
&& !cDevice::SwitchChannel(1) // ...or the next higher available one...
|
||||||
&& !cDevice::SwitchChannel(-1)) // ...or the next lower available one
|
&& !cDevice::SwitchChannel(-1)) // ...or the next lower available one
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
lastTime = time(NULL); // don't do this too often
|
lastTime = time(NULL); // don't do this too often
|
||||||
LastTimerChannel = -1;
|
LastTimerChannel = -1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user