diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2007-02-25 18:00:00 +0100 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2007-02-25 18:00:00 +0100 |
commit | 9f42c33ef6793482a5c2515f9a87c13c0d189c60 (patch) | |
tree | 45025e95c0774761760c9bc6a44f4e69a1baf43b /libsi/descriptor.h | |
parent | 66ab78a40f5b57e20142a33484e32c785a0c4017 (diff) | |
download | vdr-patch-lnbsharing-9f42c33ef6793482a5c2515f9a87c13c0d189c60.tar.gz vdr-patch-lnbsharing-9f42c33ef6793482a5c2515f9a87c13c0d189c60.tar.bz2 |
Version 1.5.1vdr-1.5.1
- Added cDevice::HasCi() so that devices with Common Interface can be avoided
when tuning to an FTA channel, thus preserving the CAM resources even on budget
DVB cards (suggested by Petri Helin).
- Fixed i18n characters for the Hungarian texts (thanks to Thomas Günther).
- Now using cPipe instead of popen() in cCommand::Execute() to avoid problems
with open file handles when starting background commands (thanks to Reinhard
Nissl).
- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler).
- Fixed a possible crash when loading an invalid XPM file (thanks to Martin Wache).
- Updated satellite names in 'sources.conf' (thanks to Thilo Wunderlich).
- Adapted 'libsi' to DVB-S2 (thanks to Marco Schlüßler).
- Fixed handling error status in cDvbTuner::GetFrontendStatus() (thanks to
Reinhard Nissl).
- Shutdown handling has been rewritten (thanks to Udo Richter).
- Plugins can now implement the new function WakeupTime() to request VDR to wake
up at a particular time (thanks to Udo Richter).
- The HUP signal now forces a restart of VDR (thanks to Udo Richter).
- cThread::EmergencyExit() has been replaced by ShutdownHandler.RequestEmergencyExit().
- Several references to "button" in a remote control context have been changed
to "key" (based on a report from Marko Mäkelä regarding the "Menu button closes"
text). The "MenuButtonCloses" parameter in 'setup.conf' has therefore been
renamed to "MenuKeyCloses", accordingly. This will result in an "unknown config
parameter: MenuButtonCloses" error message in the log file, so you may want to
remove that entry from your 'setup.conf' file.
- Simplified the error handling in cDvbTuner::GetFrontendStatus() (based on a
discussion with Reinhard Nissl).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Increased the maximum number of DVB devices to 8 (thanks to Rolf Ahrenberg).
- The new Setup parameter "Channel entry timeout" can be used to customize the time
since the last keypress until a numerically entered channel number is considered
complete, and the channel is switched (suggested by Helmut Auer). Setting this
parameter to 0 turns off the automatic channel switching, and the user will
have to confirm the entry by pressing the "Ok" key.
Diffstat (limited to 'libsi/descriptor.h')
-rw-r--r-- | libsi/descriptor.h | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/libsi/descriptor.h b/libsi/descriptor.h index c0c884f..161793e 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 1.15 2006/05/28 14:25:30 kls Exp $ + * $Id: descriptor.h 1.16 2007/02/03 11:45:58 kls Exp $ * * ***************************************************************************/ @@ -210,7 +210,9 @@ public: int getOrbitalPosition() const; int getWestEastFlag() const; int getPolarization() const; - int getModulation() const; + int getModulationSystem() const; + int getModulationType() const; + int getRollOff() const; int getSymbolRate() const; int getFecInner() const; protected: @@ -236,6 +238,9 @@ class TerrestrialDeliverySystemDescriptor : public Descriptor { public: int getFrequency() const; int getBandwidth() const; + int getPriority() const; + int getTimeSlicingIndicator() const; + int getMpeFecIndicator() const; int getConstellation() const; int getHierarchy() const; int getCodeRateHP() const; @@ -484,6 +489,30 @@ private: const descr_ancillary_data *s; }; +class S2SatelliteDeliverySystemDescriptor : public Descriptor { +public: + int getScramblingSequenceSelector() const; + int getMultipleInputStreamFlag() const; + int getBackwardsCompatibilityIndicator() const; + int getScramblingSequenceIndex() const; + int getInputStreamIdentifier() const { return input_stream_identifier; } +protected: + virtual void Parse(); +private: + const descr_s2_satellite_delivery_system *s; + const descr_scrambling_sequence_selector *sss; + int input_stream_identifier; +}; + +class ExtensionDescriptor : public Descriptor { +public: + int getExtensionDescriptorTag() const; +protected: + virtual void Parse(); +private: + const descr_extension *s; +}; + // Private DVB Descriptor Premiere.de // 0xF2 Content Transmission Descriptor // http://dvbsnoop.sourceforge.net/examples/example-private-section.html |