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.c | |
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.c')
-rw-r--r-- | libsi/descriptor.c | 61 |
1 files changed, 58 insertions, 3 deletions
diff --git a/libsi/descriptor.c b/libsi/descriptor.c index 1654a33..f3bb344 100644 --- a/libsi/descriptor.c +++ b/libsi/descriptor.c @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: descriptor.c 1.21 2006/05/28 14:25:30 kls Exp $ + * $Id: descriptor.c 1.22 2007/02/03 11:45:58 kls Exp $ * * ***************************************************************************/ @@ -418,8 +418,16 @@ int SatelliteDeliverySystemDescriptor::getPolarization() const { return s->polarization; } -int SatelliteDeliverySystemDescriptor::getModulation() const { - return s->modulation; +int SatelliteDeliverySystemDescriptor::getModulationSystem() const { + return s->modulation_system; +} + +int SatelliteDeliverySystemDescriptor::getModulationType() const { + return s->modulation_type; +} + +int SatelliteDeliverySystemDescriptor::getRollOff() const { + return s->roll_off; } int SatelliteDeliverySystemDescriptor::getSymbolRate() const { @@ -462,6 +470,18 @@ int TerrestrialDeliverySystemDescriptor::getFrequency() const { return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo); } +int TerrestrialDeliverySystemDescriptor::getPriority() const { + return s->priority; +} + +int TerrestrialDeliverySystemDescriptor::getTimeSlicingIndicator() const { + return s->time_slicing_indicator; +} + +int TerrestrialDeliverySystemDescriptor::getMpeFecIndicator() const { + return s->mpe_fec_indicator; +} + int TerrestrialDeliverySystemDescriptor::getBandwidth() const { return s->bandwidth; } @@ -794,6 +814,41 @@ int AncillaryDataDescriptor::getAncillaryDataIdentifier() const { return s->ancillary_data_identifier; } +void S2SatelliteDeliverySystemDescriptor::Parse() { + int offset=0; + input_stream_identifier=0; + data.setPointerAndOffset<const descr_s2_satellite_delivery_system>(s, offset); + if (s->scrambling_sequence_selector) + data.setPointerAndOffset<const descr_scrambling_sequence_selector>(sss, offset); + if (s->multiple_input_stream_flag) + input_stream_identifier = *data.getData(offset++); +} + +int S2SatelliteDeliverySystemDescriptor::getScramblingSequenceSelector() const { + return s->scrambling_sequence_selector; +} + +int S2SatelliteDeliverySystemDescriptor::getMultipleInputStreamFlag() const { + return s->multiple_input_stream_flag; +} + +int S2SatelliteDeliverySystemDescriptor::getBackwardsCompatibilityIndicator() const { + return s->backwards_compatibility_indicator; +} + +int S2SatelliteDeliverySystemDescriptor::getScramblingSequenceIndex() const { + return sss == NULL ? 0 : (sss->scrambling_sequence_index_hi_lo << 16) | HILO(sss->scrambling_sequence_index_lo); +} + +void ExtensionDescriptor::Parse() { + int offset=0; + data.setPointerAndOffset<const descr_extension>(s, offset); +} + +int ExtensionDescriptor::getExtensionDescriptorTag() const { + return s->descriptor_tag_extension; +} + int PremiereContentTransmissionDescriptor::getOriginalNetworkId() const { return HILO(s->original_network_id); } |