mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
889f7deeb4
VDR developer version 1.7.36 is now available at
ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.36.tar.bz2
A 'diff' against the previous version is available at
ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.35-1.7.36.diff
MD5 checksums:
e514f72a2a8c44f39e47b540d6ad325f vdr-1.7.36.tar.bz2
9312a0d10bcda87d3c3c7e6dfbebcd05 vdr-1.7.35-1.7.36.diff
WARNING:
========
This is a developer version. Even though I use it in my productive
environment. I strongly recommend that you only use it under controlled
conditions and for testing and debugging.
From the HISTORY file:
- Added maximum SNR value for PCTV Systems nanoStick T2 290e (thanks to Antti
Hartikainen).
- Added a remark indicating that the coordinates of Rect in a call to
cDevice::CanScaleVideo() are in the range of the width and height returned by
GetOsdSize() (suggested by Reinhard Nissl).
- Modified the Makefiles (thanks to Christopher Reimer).
By default VDR is now built according to the FHS ("File system Hierarchy Standard"),
and a plain "make" in the VDR source directory just builds everything, but doesn't
copy it to ./PLUGINS/lib and ./locale any more. You can use a Make.config file
(copied from Make.config.template) and set the parameter LCLBLD=1 to have everything
built and installed under the VDR source tree (as was the default in previous
versions). If you already have your own Make.config file, you may want to copy the
new Make.config.template and adapt it to your needs. If you don't want VDR's data
files to be spread around your system according to the FHS, you can set the
parameter ONEDIR=1 (using Make.config) to have all files in one /video directory as
before.
- Fixed the example for cReceiver in PLUGINS.html.
- Fixed sorting recordings in case two folders have the same name, but one of them
ends in an additional digit, as in "abc" and "abc2" (reported by Andreas Mair).
- Added "repeat" function when using the keyboard to control VDR (thanks to Reinhard
Nissl).
- The SVDRP command LSTR now knows the additional parameter "path", which can be
given to get the actual file name of a recording's directory (suggested by
Stefan Stolz).
- Fixed multiple occurrences of the same directory in the recordings list in case there
are directories that only differ in non-alphanumeric characters (reported by Andreas
Mair).
- Absolute jumps when replaying a recording (via the Red key) are now only performed
if an actual value has been entered (suggested by Ulf Kiener).
- The last replayed recording is now stored in setup.conf, which allows the blue
"Resume" key in the main menu to work even after a restart of VDR.
- The SVDRP command NEWT no longer checks whether a timer with the given data already
exists (suggested by Malte Forkel).
- Implemented scaling of SPU bitmaps (thanks to Johann Friedrichs).
- Improved cutting MPEG-2 video (thanks to Sören Moch).
- Reduced the number of retries in cTransfer::Receive() to avoid blocking recordings
in case the primary device can't handle the current live signal.
82 lines
2.3 KiB
C
82 lines
2.3 KiB
C
/*
|
|
* transfer.c: Transfer mode
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: transfer.c 2.7 2013/01/20 13:40:30 kls Exp $
|
|
*/
|
|
|
|
#include "transfer.h"
|
|
|
|
// --- cTransfer -------------------------------------------------------------
|
|
|
|
cTransfer::cTransfer(const cChannel *Channel)
|
|
:cReceiver(Channel, TRANSFERPRIORITY)
|
|
{
|
|
patPmtGenerator.SetChannel(Channel);
|
|
retriesExceeded = false;
|
|
}
|
|
|
|
cTransfer::~cTransfer()
|
|
{
|
|
cReceiver::Detach();
|
|
cPlayer::Detach();
|
|
}
|
|
|
|
void cTransfer::Activate(bool On)
|
|
{
|
|
if (On) {
|
|
PlayTs(patPmtGenerator.GetPat(), TS_SIZE);
|
|
int Index = 0;
|
|
while (uchar *pmt = patPmtGenerator.GetPmt(Index))
|
|
PlayTs(pmt, TS_SIZE);
|
|
}
|
|
else
|
|
cPlayer::Detach();
|
|
}
|
|
|
|
#define MAXRETRIES 5 // max. number of retries for a single TS packet
|
|
#define RETRYWAIT 5 // time (in ms) between two retries
|
|
#define RETRYPAUSE 10000 // time (in ms) for which to pause retrying once a packet has not been accepted
|
|
|
|
void cTransfer::Receive(uchar *Data, int Length)
|
|
{
|
|
if (cPlayer::IsAttached()) {
|
|
// Transfer Mode means "live tv", so there's no point in doing any additional
|
|
// buffering here. The TS packets *must* get through here! However, every
|
|
// now and then there may be conditions where the packet just can't be
|
|
// handled when offered the first time, so that's why we try several times:
|
|
for (int i = 0; i < MAXRETRIES; i++) {
|
|
if (PlayTs(Data, Length) > 0) {
|
|
if (retriesExceeded && timer.TimedOut())
|
|
retriesExceeded = false;
|
|
return;
|
|
}
|
|
if (retriesExceeded) // no retries once a packet has not been accepted
|
|
return;
|
|
cCondWait::SleepMs(RETRYWAIT);
|
|
}
|
|
retriesExceeded = true;
|
|
timer.Set(RETRYPAUSE); // wait a while before retrying
|
|
esyslog("ERROR: TS packet not accepted in Transfer Mode");
|
|
}
|
|
}
|
|
|
|
// --- cTransferControl ------------------------------------------------------
|
|
|
|
cDevice *cTransferControl::receiverDevice = NULL;
|
|
|
|
cTransferControl::cTransferControl(cDevice *ReceiverDevice, const cChannel *Channel)
|
|
:cControl(transfer = new cTransfer(Channel), true)
|
|
{
|
|
ReceiverDevice->AttachReceiver(transfer);
|
|
receiverDevice = ReceiverDevice;
|
|
}
|
|
|
|
cTransferControl::~cTransferControl()
|
|
{
|
|
receiverDevice = NULL;
|
|
delete transfer;
|
|
}
|