From 506eb479a567ef00b4c2a332007ba3e03cbe21ef Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 6 Feb 2005 11:44:56 +0100
Subject: Removed 'flags' from tTrackId
---
HISTORY | 1 +
device.c | 8 +++-----
device.h | 8 +++-----
player.h | 4 ++--
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/HISTORY b/HISTORY
index 35b4084c..ba37f11a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3365,3 +3365,4 @@ Video Disk Recorder Revision History
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).
diff --git a/device.c b/device.c
index 88f41d27..8d52a2c1 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -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);
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));
if (Description)
strn0cpy(availableTracks[t].description, Description, sizeof(availableTracks[t].description));
- if (Id) {
- availableTracks[t].flags = Flags;
+ if (Id)
availableTracks[t].id = Id; // setting 'id' last to avoid the need for extensive locking
- }
if (t == currentAudioTrack)
currentAudioTrackMissingCount = 0;
else if (!availableTracks[currentAudioTrack].id && currentAudioTrackMissingCount++ > NumAudioTracks() * 10)
diff --git a/device.h b/device.h
index 0ded7daf..80587992 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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
@@ -78,8 +78,6 @@ struct tTrackId {
uint16_t id; // The PES packet id or the PID.
char language[8]; // something like either "eng" or "deu/eng"
char description[32]; // something like "Dolby Digital 5.1"
- // for future use:
- uint32_t flags; // Used to further identify the actual track.
};
class cChannel;
@@ -322,11 +320,11 @@ protected:
///< Sets the current audio track to the given value.
public:
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.
///< Type must be one of the basic eTrackType values, like ttAudio or ttDolby.
///< 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.
///< \return Returns true if the track was set correctly, false otherwise.
const tTrackId *GetTrack(eTrackType Type);
diff --git a/player.h b/player.h
index 0f73d9b0..3ffc7e36 100644
--- a/player.h
+++ b/player.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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
@@ -19,7 +19,7 @@ private:
cDevice *device;
ePlayMode playMode;
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 DeviceFlush(int TimeoutMs = 0) { return device ? device->Flush(TimeoutMs) : true; }
void DeviceTrickSpeed(int Speed) { if (device) device->TrickSpeed(Speed); }
--
cgit v1.2.3