summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY4
-rw-r--r--device.h5
-rw-r--r--remux.c4
-rw-r--r--remux.h10
4 files changed, 14 insertions, 9 deletions
diff --git a/HISTORY b/HISTORY
index de97149c..d5ebed93 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6197,6 +6197,8 @@ Video Disk Recorder Revision History
- Fixed the default value for "Pause key handling" in the MANUAL (reported by
Diego Pierotto).
-2009-11-22: Version 1.7.11
+2009-12-05: Version 1.7.11
- Fixed resetting the file size when regenerating the index file.
+- The new function cDevice::PatPmtParser() can be used in derived devices to access
+ the PAT/PMT of the currently replayed material.
diff --git a/device.h b/device.h
index 5698fde2..b6aef6e5 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 2.16 2009/11/22 13:21:00 kls Exp $
+ * $Id: device.h 2.17 2009/12/04 15:03:16 kls Exp $
*/
#ifndef __DEVICE_H
@@ -498,6 +498,9 @@ private:
cTsToPes tsToPesSubtitle;
bool isPlayingVideo;
protected:
+ const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; }
+ ///< Returns a pointer to the patPmtParser, so that a derived device
+ ///< can use the stream information from it.
virtual bool CanReplay(void) const;
///< Returns true if this device can currently start a replay session.
virtual bool SetPlayMode(ePlayMode PlayMode);
diff --git a/remux.c b/remux.c
index c5055b69..8cf5a938 100644
--- a/remux.c
+++ b/remux.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: remux.c 2.29 2009/11/22 11:23:27 kls Exp $
+ * $Id: remux.c 2.30 2009/12/04 15:05:35 kls Exp $
*/
#include "remux.h"
@@ -599,7 +599,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
pmtSize = 0;
}
-bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion)
+bool cPatPmtParser::GetVersions(int &PatVersion, int &PmtVersion) const
{
PatVersion = patVersion;
PmtVersion = pmtVersion;
diff --git a/remux.h b/remux.h
index ad099c6a..e67f16a5 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: remux.h 2.20 2009/11/21 15:55:34 kls Exp $
+ * $Id: remux.h 2.21 2009/12/04 15:04:43 kls Exp $
*/
#ifndef __REMUX_H
@@ -232,16 +232,16 @@ public:
///< are delivered to the parser through several subsequent calls to
///< ParsePmt(). The whole PMT data will be processed once the last packet
///< has been received.
- bool GetVersions(int &PatVersion, int &PmtVersion);
+ bool GetVersions(int &PatVersion, int &PmtVersion) const;
///< Returns true if a valid PAT/PMT has been parsed and stores
///< the current version numbers in the given variables.
- int PmtPid(void) { return pmtPid; }
+ int PmtPid(void) const { return pmtPid; }
///< Returns the PMT pid as defined by the current PAT.
///< If no PAT has been received yet, -1 will be returned.
- int Vpid(void) { return vpid; }
+ int Vpid(void) const { return vpid; }
///< Returns the video pid as defined by the current PMT, or 0 if no video
///< pid has been detected, yet.
- int Vtype(void) { return vtype; }
+ int Vtype(void) const { return vtype; }
///< Returns the video stream type as defined by the current PMT, or 0 if no video
///< stream type has been detected, yet.
};