mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
8849308cf9
- Fixed a buffer overflow in initializing the system character table (thanks to Marco Schlüßler). - Updated the Russian OSD texts (thanks to Oleg Roitburd). - Fixed handling single byte characters >0x7F in Utf8ToArray() (thanks to Udo Richter). - Improved numdigits(), isnumber() and strreplace() (thanks to Tobias Bratfisch). - Fixed clearing color buttons in the 'curses' skin (thanks to Udo Richter). - Fixed a typo in the function name of cOsd::SetOsdPosition() and added a range check to it (thanks to Christoph Haubrich). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Improved cControl::Launch() to keep 'control' from pointing to uninitialized memory (thanks to Rolf Ahrenberg). - Made skipspace() an inline function (suggested by Tobias Bratfisch) and changed it to handle the most common case of 'no leading space' very fast, and avoid calling isspace(), which made the whole function a lot faster. - Fixed detection of Premiere NVOD channel links (thanks to Markus Hahn). - Added a table of the used trick speed values to the description of cDevice::TrickSpeed() (suggested by Martin Dauskardt). - Added a missing 'P' to vdr.c's SHUTDOWNCANCELROMPT macro (reported by Marco Schlüßler).
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 1.12 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;
|
|
}
|