frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Removed 'flags' from tTrackId

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-02-06 11:44:56 +01:00
parent 1f677366c4
commit 506eb479a5
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -3365,3 +3365,4 @@ Video Disk Recorder Revision History
recording (thanks to Sascha Volkenandt for reporting a problem when starting 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 replay of a recording that has no Dolby Digital audio after switching to a channel
that has DD and selecting the DD audio track). that has DD and selecting the DD audio track).
- Removed 'flags' from tTrackId (thought we would need this, but apparently we don't).

8
device.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: device.c 1.82 2005/02/06 11:32:05 kls Exp $ * $Id: device.c 1.83 2005/02/06 11:43:20 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -649,7 +649,7 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
} }
} }
bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language, const char *Description, uint32_t Flags) bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language, const char *Description)
{ {
eTrackType t = eTrackType(Type + Index); eTrackType t = eTrackType(Type + Index);
if (Type == ttAudio && IS_AUDIO_TRACK(t) || if (Type == ttAudio && IS_AUDIO_TRACK(t) ||
@ -658,10 +658,8 @@ bool cDevice::SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const c
strn0cpy(availableTracks[t].language, Language, sizeof(availableTracks[t].language)); strn0cpy(availableTracks[t].language, Language, sizeof(availableTracks[t].language));
if (Description) if (Description)
strn0cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description)); strn0cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
if (Id) { if (Id)
availableTracks[t].flags = Flags;
availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking
}
if (t == currentAudioTrack) if (t == currentAudioTrack)
currentAudioTrackMissingCount = 0; currentAudioTrackMissingCount = 0;
else if (!availableTracks[currentAudioTrack].id && currentAudioTrackMissingCount++ > NumAudioTracks() * 10) else if (!availableTracks[currentAudioTrack].id && currentAudioTrackMissingCount++ > NumAudioTracks() * 10)

8
device.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: device.h 1.54 2005/02/06 11:25:37 kls Exp $ * $Id: device.h 1.55 2005/02/06 11:43:04 kls Exp $
*/ */
#ifndef __DEVICE_H #ifndef __DEVICE_H
@ -78,8 +78,6 @@ struct tTrackId {
uint16_t id; // The PES packet id or the PID. uint16_t id; // The PES packet id or the PID.
char language[8]; // something like either "eng" or "deu/eng" char language[8]; // something like either "eng" or "deu/eng"
char description[32]; // something like "Dolby Digital 5.1" char description[32]; // something like "Dolby Digital 5.1"
// for future use:
uint32_t flags; // Used to further identify the actual track.
}; };
class cChannel; class cChannel;
@ -322,11 +320,11 @@ protected:
///< Sets the current audio track to the given value. ///< Sets the current audio track to the given value.
public: public:
void ClrAvailableTracks(bool DescriptionsOnly = false); void ClrAvailableTracks(bool DescriptionsOnly = false);
bool SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL, uint32_t Flags = 0); bool SetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL);
///< Sets the track of the given Type and Index to the given values. ///< Sets the track of the given Type and Index to the given values.
///< Type must be one of the basic eTrackType values, like ttAudio or ttDolby. ///< Type must be one of the basic eTrackType values, like ttAudio or ttDolby.
///< Index tells which track of the given basic type is meant. ///< Index tells which track of the given basic type is meant.
///< If Id is 0 any existing id (and flags) will be left untouched and only the ///< If Id is 0 any existing id will be left untouched and only the
///< given Language and Description will be set. ///< given Language and Description will be set.
///< \return Returns true if the track was set correctly, false otherwise. ///< \return Returns true if the track was set correctly, false otherwise.
const tTrackId *GetTrack(eTrackType Type); const tTrackId *GetTrack(eTrackType Type);

4
player.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: player.h 1.14 2004/12/30 10:44:34 kls Exp $ * $Id: player.h 1.15 2005/02/06 11:44:56 kls Exp $
*/ */
#ifndef __PLAYER_H #ifndef __PLAYER_H
@ -19,7 +19,7 @@ private:
cDevice *device; cDevice *device;
ePlayMode playMode; ePlayMode playMode;
protected: protected:
bool DeviceSetAvailableTrack(eTrackType Type, int Index, uint16_t Id, const char *Language = NULL, const char *Description = NULL, uint32_t Flags = 0) { return device ? device->SetAvailableTrack(Type, Index, Id, Language, Description, Flags) : false; } 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 DevicePoll(cPoller &Poller, int TimeoutMs = 0) { return device ? device->Poll(Poller, TimeoutMs) : false; }
bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; } bool DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); } void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }