mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
4d477cd144
- Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu in case there is only one audio track (thanks to Sascha Volkenandt for reporting this one). - Now setting primaryDevice = NULL before deleting the devices in cDevice::Shutdown() to avoid problems in case other threads access it (thanks to Wolfgang Rohdewald for pointing this out). - Fixed a buffer overflow in case a station defines all 32 audio PIDs (thanks to Christian Jacobsen for reporting this one). - Fixed masking SubStreamType in cDevice::PlayPesPacket() (thanks to Werner Fink for pointing out this one). - The new function cPlugin::Stop() shall be used to stop any background activities of a plugin. Previously this was done in the plugin's destructor, but it is better to do this in a dedicated function that can be called early when shutting down. - Moved the call to SetAudioChannel(0) into cDevice::ClrAvailableTracks() to have it executed also when starting a replay. - Completed the Danish OSD texts (thanks to Mogens Elneff). - Completed the French OSD texts (thanks to Olivier Jacques). - The new setup option "OSD/Channel info time" can be used to define the time after which the channel display is removed if no key has been pressed (thanks to Olivier Jacques). - Modified cDolbyRepacker to make sure PES packets don't exceed the requested length (thanks to Reinhard Nissl). - Fixed several memory leaks that were introduced through the use of cString (thanks to Stefan Huelswitt for reporting these). - Added CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler). - Making sure the current audio track is actually one of the ones available in a recording (thanks to Sascha Volkenandt for reporting a problem when starting replay of a recording that has no Dolby Digital audio after switching to a channel that has DD and selecting the DD audio track). - Removed 'flags' from tTrackId (thought we would need this, but apparently we don't). - Making sure the "Mute" and "Volume+/-" keys don't interfere with digital audio. - Fixed the "pre 1.3.19" compatibility mode for old Dolby Digital recordings (thanks to Werner Fink for pointing out that this can be triggered in the default branch). - Calling pesAssembler->Reset() in cDevice::AttachPlayer() to avoid problems with residual data in replay and Transfer Mode (thanks to Werner Fink for pointing this out). - Added MPEG1 replay capability to cPesAssembler (thanks to Stefan Huelswitt).
79 lines
3.4 KiB
C++
79 lines
3.4 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.15 2005/02/06 11:44:56 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:
|
|
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 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
|