summaryrefslogtreecommitdiff
path: root/libsi/descriptor.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2012-01-15 16:10:00 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2012-01-15 16:38:48 +0100
commit59f0138a7d03fed4fc33e1083928bf5b28e0e4ff (patch)
tree5d238aabf1b703dff01c9f381a7e552ed6bdf092 /libsi/descriptor.h
parent5a28d999363f8ace192489d4f6b13dfeb6cfc20b (diff)
downloadvdr-patches-59f0138a7d03fed4fc33e1083928bf5b28e0e4ff.tar.gz
vdr-patches-59f0138a7d03fed4fc33e1083928bf5b28e0e4ff.tar.bz2
Version 1.7.23
Original announce message: VDR developer version 1.7.23 is now available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.23.tar.bz2 A 'diff' against the previous version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.22-1.7.23.diff MD5 checksums: de136f7be28c4b6f1fa0e2218b4acc11 vdr-1.7.23.tar.bz2 2977b75cd8dacad187d11c10b867d56a vdr-1.7.22-1.7.23.diff WARNING: ======== This is a developer version. Even though I use it in my productive environment. I strongly recommend that you only use it under controlled conditions and for testing and debugging. From the HISTORY file: - Removed the '.pl' suffix from svdrpsend.pl (sorry, I missed that one). - Fixed bonding more than two devices. - Fixed handling symbolic links in cRecordings::ScanVideoDir() (reported by Sundararaj Reel). - Fixed a memory leak in cRecordings::ScanVideoDir() in case there are too many link levels (reported by Sundararaj Reel). - Removed redundant memset() in the ctor of cSatCableNumbers (triggered by Ville Skyttä pointing out that the argument sequence in the call was wrong). - Removed a redundant NULL check in cDvbSpuDecoder::setTime() (thanks to Ville Skyttä). - Added HasSnr to the DEBUG_SIGNALQUALITY output in cDvbTuner::GetSignalQuality() (triggered by Ville Skyttä pointing out that the variable HasSnr was unused). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Added support for HbbTV to libsi (thanks to Christoph Haubrich). - Added support for devices with more than one delivery system per frontend. This requires a DVB driver with version 5.5 or higher that can handle the DTV_ENUM_DELSYS call. With older drivers it will fall back to one delivery system per frontend. - Updated the Hungarian language texts (thanks to István Füley). - cDvbTuner::ExecuteDiseqc() now makes sure only one tuner sends SCR commands at any given time (reported by Frank Neumann). - cEvent::FixEpgBugs() now replaces any newline characters in stream component descriptions with blanks (thanks to Torsten Lang for reporting a problem with EPG data from BSkyB's "MTV MUSIC", S28.2E-2-2010-7012). - Fixed cDvbSubtitleConverter::SetOsdData() (thanks to Rolf Ahrenberg). - Fixed cListBase::Move() in case From and To are equal (reported by Sundararaj Reel). - Added support for DVB-T2 to libsi (thanks to Rolf Ahrenberg). - Added support for handling DVB-T2 transponders. This requires a DVB driver with version 5.3 or higher that can handle the DTV_DVBT2_PLP_ID call (thanks to Rolf Ahrenberg). - Fixed cConfig::Load() for g++ version 4.7.0 (thanks to Ville Skyttä). - Fixed a possible memory corruption in cTsToPes::GetPes() in case of broken TS packets, e.g. when switching channels. - Fixed the SVDRP command CLRE for a single channel in case there are events that have a timer (thanks to Timo Eskola). - BIDI support now checks at runtime whether the system runs with UTF-8 (suggested by Torsten Lang). - Added member functions Adapter() and Frontend() to cDvbDevice (suggested by Rolf Ahrenberg). - The parameters that are only used by "second generation" delivery systems (DVB-S2 and DVB-T2) are no longer written into channels.conf for "first generation" delivery systems (DVB-S and DVB-T). - Changed IndexToHMSF() so that it can handle negative Index values. - Added option -N to the msgmerge call in the Makefile, because fuzzy translation mostly resulted in useless strings. - The new setup option "Replay/Show remaining time" can be used to switch between showing the total length or the remaining time of the recording that is currently replayed. - Fixed wrongfully displaying the length of a recording in the title of the replay progress display. - Fixed frozen live view with device bonding in case the bonded master is used for live viewing (reported by Uwe Scheffler).
Diffstat (limited to 'libsi/descriptor.h')
-rw-r--r--libsi/descriptor.h42
1 files changed, 41 insertions, 1 deletions
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index f105f7a..3025876 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * $Id: descriptor.h 2.2 2011/06/15 21:26:00 kls Exp $
+ * $Id: descriptor.h 2.4 2012/01/11 11:35:17 kls Exp $
* *
***************************************************************************/
@@ -538,6 +538,25 @@ private:
const descr_extension *s;
};
+class T2DeliverySystemDescriptor : public Descriptor {
+public:
+ int getExtendedDataFlag() const;
+ int getExtensionDescriptorTag() const;
+ int getPlpId() const;
+ int getT2SystemId() const;
+ int getSisoMiso() const;
+ int getBandwidth() const;
+ int getGuardInterval() const;
+ int getTransmissionMode() const;
+ int getOtherFrequencyFlag() const;
+ int getTfsFlag() const;
+protected:
+ virtual void Parse();
+private:
+ const descr_t2_delivery_system *s;
+ int extended_data_flag;
+};
+
// Private DVB Descriptor Premiere.de
// 0xF2 Content Transmission Descriptor
// http://dvbsnoop.sourceforge.net/examples/example-private-section.html
@@ -639,17 +658,29 @@ protected:
class MHP_TransportProtocolDescriptor : public Descriptor {
public:
+ class UrlExtensionEntry : public LoopElement {
+ public:
+ virtual int getLength() { return sizeof(descr_url_extension_entry)+UrlExtension.getLength(); }
+ String UrlExtension;
+ protected:
+ virtual void Parse();
+ };
+
enum Protocol { ObjectCarousel = 0x01, IPviaDVB = 0x02, HTTPoverInteractionChannel = 0x03 };
int getProtocolId() const;
int getProtocolLabel() const;
bool isRemote() const;
int getComponentTag() const;
+ char *getUrlBase(char *buffer, int size);
+ StructureLoop<UrlExtensionEntry> UrlExtensionLoop;
+
protected:
virtual void Parse();
private:
const descr_transport_protocol *s;
bool remote;
int componentTag;
+ String UrlBase;
};
class MHP_DVBJApplicationDescriptor : public Descriptor {
@@ -685,6 +716,15 @@ private:
const descr_application_icons_descriptor_end *s;
};
+class MHP_SimpleApplicationLocationDescriptor : public Descriptor {
+public:
+ char *getLocation(char *buffer, int size);
+protected:
+ virtual void Parse();
+private:
+ String location;
+};
+
class RegistrationDescriptor : public Descriptor {
public:
int getFormatIdentifier() const;