mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
630ba21dc1
- Fixed cRemux::ScanVideoPacket() to make sure it doesn't access memory beyond the end of the given buffer, which has caused some unjustified "unknown picture type errors" (thanks to Marco Schlüßler). - Fixed a possible crash when pausing live video and the recording was unable to start, maybe because there was no lock on the device (thanks to Andreas Brugger for reporting this one). - Fixed some characters in the iso8859-2 font file (thanks to Dino Ravnic). - Fixed some errors in the Croatian language texts (thanks to Dino Ravnic). - Fixed a possible recursion in cControl::Shutdown() (thanks to Sascha Volkenandt). - Now setting the VPID before the APID in live mode to avoid unnecessary overhead in the firmware (thanks to Werner Fink). - Now checking available OSD memory at runtime (thanks to Oliver Endriss). - Fixed some typos in the Makefile's 'font' target (thanks to Olaf Titz). - Fixed handling childTid in cThread to avoid possible race conditions (thanks to Stefan Huelswitt for pointing this out). - Fixed toggling the "Day" item in the "Timers" menu, so that it selects the right day of week for timers in the future. - Some improvements to cPoller (thanks to Marco Schlüßler).
95 lines
1.8 KiB
C
95 lines
1.8 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.8 2004/11/20 11:33:08 kls Exp $
|
|
*/
|
|
|
|
#include "player.h"
|
|
#include "i18n.h"
|
|
|
|
// --- cPlayer ---------------------------------------------------------------
|
|
|
|
cPlayer::cPlayer(ePlayMode PlayMode)
|
|
{
|
|
device = NULL;
|
|
playMode = PlayMode;
|
|
}
|
|
|
|
cPlayer::~cPlayer()
|
|
{
|
|
Detach();
|
|
}
|
|
|
|
int cPlayer::PlayVideo(const uchar *Data, int Length)
|
|
{
|
|
if (device)
|
|
return device->PlayVideo(Data, Length);
|
|
esyslog("ERROR: attempt to use cPlayer::PlayVideo() without attaching to a cDevice!");
|
|
return -1;
|
|
}
|
|
|
|
void cPlayer::PlayAudio(const uchar *Data, int Length)
|
|
{
|
|
if (device) {
|
|
device->PlayAudio(Data, Length);
|
|
return;
|
|
}
|
|
esyslog("ERROR: attempt to use cPlayer::PlayAudio() without attaching to a cDevice!");
|
|
}
|
|
|
|
void cPlayer::Detach(void)
|
|
{
|
|
if (device)
|
|
device->Detach(this);
|
|
}
|
|
|
|
// --- cControl --------------------------------------------------------------
|
|
|
|
cControl *cControl::control = NULL;
|
|
|
|
cControl::cControl(cPlayer *Player, bool Hidden)
|
|
{
|
|
attached = false;
|
|
hidden = Hidden;
|
|
player = Player;
|
|
}
|
|
|
|
cControl::~cControl()
|
|
{
|
|
if (this == control)
|
|
control = NULL;
|
|
}
|
|
|
|
cControl *cControl::Control(void)
|
|
{
|
|
return (control && !control->hidden) ? control : NULL;
|
|
}
|
|
|
|
void cControl::Launch(cControl *Control)
|
|
{
|
|
delete control;
|
|
control = Control;
|
|
}
|
|
|
|
void cControl::Attach(void)
|
|
{
|
|
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)
|
|
{
|
|
cControl *c = control; // avoids recursions
|
|
control = NULL;
|
|
delete c;
|
|
}
|