mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
dbacda8274
- Fixed cDvbDevice::SetAudioTrackDevice() to avoid a blank screen after switching back to live mode if a recording is currently active on the primary device. - Fixed a possible freeze in pause mode in case a device's PlayPesPacket() function permanently returns 0 (thanks to Reinhard Nissl and Olaf Titz). - Completed the Finnish OSD texts (thanks to Rolf Ahrenberg). - Restricted the "setting audio track" log message to automatic changes during replay. - Fixed handling Transfer Mode for radio channels (thanks to Andreas Regel for reporting this one). - Fixed handling symbolic links in cRecordings::ScanVideoDir() (thanks to Stefan Huelswitt). - Completed the Danish OSD texts (thanks to Mogens Elneff). - Forcing a new resync after a call to cRemux::Clear() (suggested by Marco Schlüßler). - The cAudio::Play() function now has an additional parameter 'uchar Id' which tells the function the substream id of the given audio packet, so that a plugin can take the right action for the various kinds if audio data - which now also includes "normal" audio with ids 0xC0...0xDF (based on suggestions by Werner Fink and Macro Schlüßler). - Removed the "Cleared/PlayPes(NULL, 0)" handling from cTransfer::Action(), since this is now done when attaching the player to the device (thanks to Marco Schlüßler). - Making sure the buffer reserve in cTransfer::Action() is re-established after clearing the buffer. - Added DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer (thanks to Marco Schlüßler). - Fixed a typo in detecting UTF-8 (thanks to Reinhard Nissl). - Now using twice the buffer reserve in cTransfer if the primary DVB card is an unmodified version with only 2MB of SDRAM, to avoid audio stuttering when playing Dolby Digital over the DVB card (thanks to Christian Jacobsen and Chad Flynt for suggestions and experiments in that area). - Making sure the first audio packet is not dropped when switching to "pre 1.3.19 Dolby Digital compatibility mode". - The 'plugins-clean' target of the Makefile now only deletes the actual plugin library files from this version of VDR (suggested by Andreas Brachold). - Added a missing 'resultSkipped = 0' to cRemux::Clear() (thanks to Marco Schlüßler for reporting this one). - The new function cDvbDevice::SetTransferModeForDolbyDigital() can be used by plugins that implement Dolby Digital output and thus want to prevent the cDvbDevice from starting Transfer Mode in order to replay DD over the DVB device. - Added missing reset of the 'repacker' to cTS2PES::Clear() (thanks to Marco Schlüßler for reporting this one).
81 lines
3.6 KiB
C++
81 lines
3.6 KiB
C++
/*
|
|
* player.h: The basic player interface
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: player.h 1.16 2005/02/12 14:45:29 kls Exp $
|
|
*/
|
|
|
|
#ifndef __PLAYER_H
|
|
#define __PLAYER_H
|
|
|
|
#include "device.h"
|
|
#include "osdbase.h"
|
|
|
|
class cPlayer {
|
|
friend class cDevice;
|
|
private:
|
|
cDevice *device;
|
|
ePlayMode playMode;
|
|
protected:
|
|
void DeviceClrAvailableTracks(bool DescriptionsOnly = false) { if (device) device->ClrAvailableTracks(DescriptionsOnly); }
|
|
bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL) { return device ? device->SetAvailableTrack(Type, Index, Id, Language, Description) : false; }
|
|
bool DeviceSetCurrentAudioTrack(eTrackType Type) { return device ? device->SetCurrentAudioTrack(Type) : false; }
|
|
bool DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
|
|
bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
|
|
void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
|
|
void DeviceClear(void) { if (device) device->Clear(); }
|
|
void DevicePlay(void) { if (device) device->Play(); }
|
|
void DeviceFreeze(void) { if (device) device->Freeze(); }
|
|
void DeviceMute(void) { if (device) device->Mute(); }
|
|
void DeviceStillPicture(const uchar *Data, int Length) { if (device) device->StillPicture(Data, Length); }
|
|
void Detach(void);
|
|
virtual void Activate(bool On) {}
|
|
// This function is called right after the cPlayer has been attached to
|
|
// (On == true) or before it gets detached from (On == false) a cDevice.
|
|
// It can be used to do things like starting/stopping a thread.
|
|
int PlayPes(const uchar *Data, int Length, bool VideoOnly = false);
|
|
// Sends the given PES Data to the device and returns the number of
|
|
// bytes that have actually been accepted by the device (or a
|
|
// negative value in case of an error).
|
|
public:
|
|
cPlayer(ePlayMode PlayMode = pmAudioVideo);
|
|
virtual ~cPlayer();
|
|
bool IsAttached(void) { return device != NULL; }
|
|
virtual bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return false; }
|
|
// Returns the current and total frame index, optionally snapped to the
|
|
// nearest I-frame.
|
|
virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return false; }
|
|
// Returns the current replay mode (if applicable).
|
|
// 'Play' tells whether we are playing or pausing, 'Forward' tells whether
|
|
// we are going forward or backward and 'Speed' is -1 if this is normal
|
|
// play/pause mode, 0 if it is single speed fast/slow forward/back mode
|
|
// and >0 if this is multi speed mode.
|
|
virtual void SetAudioTrack(eTrackType Type, const tTrackId *TrackId) {}
|
|
// Sets the current audio track to the given value.
|
|
// This is just a virtual hook for players that need to do special things
|
|
// in order to switch audio tracks.
|
|
};
|
|
|
|
class cControl : public cOsdObject {
|
|
private:
|
|
static cControl *control;
|
|
bool attached;
|
|
bool hidden;
|
|
protected:
|
|
cPlayer *player;
|
|
public:
|
|
cControl(cPlayer *Player, bool Hidden = false);
|
|
virtual ~cControl();
|
|
virtual void Hide(void) = 0;
|
|
bool GetIndex(int &Current, int &Total, bool SnapToIFrame = false) { return player->GetIndex(Current, Total, SnapToIFrame); }
|
|
bool GetReplayMode(bool &Play, bool &Forward, int &Speed) { return player->GetReplayMode(Play, Forward, Speed); }
|
|
static void Launch(cControl *Control);
|
|
static void Attach(void);
|
|
static void Shutdown(void);
|
|
static cControl *Control(void);
|
|
};
|
|
|
|
#endif //__PLAYER_H
|