mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
771986b89f
- Re-implemented handling of DVB-S2, which first appeared in version 1.5.14, but was revoked in version 1.5.15 in favor of making a stable version 1.6.0. VDR now requires the "multiproto" DVB driver, e.g. from http://jusst.de/hg/multiproto. Note that the channels.conf file now supports additional parameters, so you may want to make sure you have a backup of this file in case you need to go back to the previous version of VDR! - Fixed displaying transponder data when it is modified (thanks to Reinhard Nissl). - Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard Nissl). - Improved logging system time changes to avoid problems on slow systems under heavy load (suggested by Helmut Auer). - Now setting the thread name, so that it can be seen in 'top -H' (thanks to Rolf Ahrenberg). - Fixed initializing the timer's flags in the cTimer copy constructor (thanks to Andreas Mair). - Fixed setting the OSD level in the 'osddemo' example (thanks to Wolfgang Rohdewald). - Increased the time between checking the CAM status to 500ms to avoid problems with some CAMs (reported by Arthur Konovalov).
97 lines
1.9 KiB
C
97 lines
1.9 KiB
C
/*
|
|
* player.c: The basic player interface
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: player.c 2.0 2007/07/20 15:25:24 kls Exp $
|
|
*/
|
|
|
|
#include "player.h"
|
|
#include "i18n.h"
|
|
|
|
// --- cPlayer ---------------------------------------------------------------
|
|
|
|
cPlayer::cPlayer(ePlayMode PlayMode)
|
|
{
|
|
device = NULL;
|
|
playMode = PlayMode;
|
|
}
|
|
|
|
cPlayer::~cPlayer()
|
|
{
|
|
Detach();
|
|
}
|
|
|
|
int cPlayer::PlayPes(const uchar *Data, int Length, bool VideoOnly)
|
|
{
|
|
if (device)
|
|
return device->PlayPes(Data, Length, VideoOnly);
|
|
esyslog("ERROR: attempt to use cPlayer::PlayPes() without attaching to a cDevice!");
|
|
return -1;
|
|
}
|
|
|
|
void cPlayer::Detach(void)
|
|
{
|
|
if (device)
|
|
device->Detach(this);
|
|
}
|
|
|
|
// --- cControl --------------------------------------------------------------
|
|
|
|
cControl *cControl::control = NULL;
|
|
cMutex cControl::mutex;
|
|
|
|
cControl::cControl(cPlayer *Player, bool Hidden)
|
|
{
|
|
attached = false;
|
|
hidden = Hidden;
|
|
player = Player;
|
|
}
|
|
|
|
cControl::~cControl()
|
|
{
|
|
if (this == control)
|
|
control = NULL;
|
|
}
|
|
|
|
cOsdObject *cControl::GetInfo(void)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
cControl *cControl::Control(void)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
return (control && !control->hidden) ? control : NULL;
|
|
}
|
|
|
|
void cControl::Launch(cControl *Control)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
cControl *c = control; // keeps control from pointing to uninitialized memory
|
|
control = Control;
|
|
delete c;
|
|
}
|
|
|
|
void cControl::Attach(void)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
if (control && !control->attached && control->player && !control->player->IsAttached()) {
|
|
if (cDevice::PrimaryDevice()->AttachPlayer(control->player))
|
|
control->attached = true;
|
|
else {
|
|
Skins.Message(mtError, tr("Channel locked (recording)!"));
|
|
Shutdown();
|
|
}
|
|
}
|
|
}
|
|
|
|
void cControl::Shutdown(void)
|
|
{
|
|
cMutexLock MutexLock(&mutex);
|
|
cControl *c = control; // avoids recursions
|
|
control = NULL;
|
|
delete c;
|
|
}
|