From 8f5407bc81741d3f9335e476b2a8913561f55ee3 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 13 Dec 2003 10:43:26 +0100 Subject: Removed superfluous white space; added RCS Id --- libsi/descriptor.c | 119 +++-------------------------------------------------- 1 file changed, 6 insertions(+), 113 deletions(-) (limited to 'libsi/descriptor.c') diff --git a/libsi/descriptor.c b/libsi/descriptor.c index eabe0c9e..433d6802 100644 --- a/libsi/descriptor.c +++ b/libsi/descriptor.c @@ -6,16 +6,15 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * + * $Id: descriptor.c 1.2 2003/12/13 10:42:05 kls Exp $ + * * ***************************************************************************/ - #include #include "descriptor.h" namespace SI { - - void ShortEventDescriptor::Parse() { unsigned int offset=0; const descr_short_event *s; @@ -29,9 +28,6 @@ void ShortEventDescriptor::Parse() { text.setData(data+offset, mid->text_length); } - - - int ExtendedEventDescriptor::getDescriptorNumber() { return s->descriptor_number; } @@ -52,9 +48,6 @@ void ExtendedEventDescriptor::Parse() { text.setData(data+offset, mid->text_length); } - - - void ExtendedEventDescriptor::Item::Parse() { unsigned int offset=0; const item_extended_event *first; @@ -65,7 +58,6 @@ void ExtendedEventDescriptor::Item::Parse() { item.setData(data+offset, mid->item_length); } - int ExtendedEventDescriptors::getTextLength() { int ret=0; for (int i=0;iitemLoop.hasNext(it); ) { item=d->itemLoop.getNext(it); - + item.item.getText(tempbuf); len=strlen(tempbuf); if (len) { memcpy(buffer+index, tempbuf, len); index+=len; } - + item.itemDescription.getText(tempbuf); len=strlen(tempbuf); if (len) { @@ -140,9 +132,6 @@ char *ExtendedEventDescriptors::getText(char *buffer) { return buffer; } - - - int TimeShiftedEventDescriptor::getReferenceServiceId() const { return HILO(s->reference_service_id); } @@ -155,17 +144,11 @@ void TimeShiftedEventDescriptor::Parse() { s=data.getData(); } - - - void ContentDescriptor::Parse() { //this descriptor is only a header and a loop nibbleLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader)); } - - - int ContentDescriptor::Nibble::getContentNibbleLevel1() const { return s->content_nibble_level_1; } @@ -186,15 +169,11 @@ void ContentDescriptor::Nibble::Parse() { s=data.getData(); } - - - void ParentalRatingDescriptor::Parse() { //this descriptor is only a header and a loop ratingLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader)); } - int ParentalRatingDescriptor::Rating::getRating() const { return s->rating; } @@ -206,9 +185,6 @@ void ParentalRatingDescriptor::Rating::Parse() { languageCode[2]=s->lang_code3; } - - - int CaDescriptor::getCaType() const { return HILO(s->CA_type); } @@ -223,8 +199,6 @@ void CaDescriptor::Parse() { privateData.assign(data.getData(offset), getLength()-offset); } - - int StreamIdentifierDescriptor::getComponentTag() const { return s->component_tag; } @@ -233,25 +207,14 @@ void StreamIdentifierDescriptor::Parse() { s=data.getData(); } - - - void NetworkNameDescriptor::Parse() { name.setData(data+sizeof(descr_network_name), getLength()-sizeof(descr_network_name)); } - - - void CaIdentifierDescriptor::Parse() { identifiers.setData(data+sizeof(descr_ca_identifier), getLength()-sizeof(descr_ca_identifier)); } - - - - - int CarouselIdentifierDescriptor::getCarouselId() const { return (HILO(s->carousel_id_hi) << 16) | HILO(s->carousel_id_lo); } @@ -264,16 +227,10 @@ void CarouselIdentifierDescriptor::Parse() { s=data.getData(); } - - - void ServiceListDescriptor::Parse() { serviceLoop.setData(data+sizeof(descr_service_list), getLength()-sizeof(descr_service_list)); } - - - int ServiceListDescriptor::Service::getServiceId() const { return HILO(s->service_id); } @@ -286,9 +243,6 @@ void ServiceListDescriptor::Service::Parse() { s=data.getData(); } - - - int SatelliteDeliverySystemDescriptor::getFrequency() const { return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo); } @@ -321,9 +275,6 @@ void SatelliteDeliverySystemDescriptor::Parse() { s=data.getData(); } - - - int CableDeliverySystemDescriptor::getFrequency() const { return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo); } @@ -348,9 +299,6 @@ void CableDeliverySystemDescriptor::Parse() { s=data.getData(); } - - - int TerrestrialDeliverySystemDescriptor::getFrequency() const { return (HILO(s->frequency_hi) << 16) | HILO(s->frequency_lo); } @@ -391,9 +339,6 @@ void TerrestrialDeliverySystemDescriptor::Parse() { s=data.getData(); } - - - int ServiceDescriptor::getServiceType() const { return s->service_type; } @@ -411,9 +356,6 @@ void NVODReferenceDescriptor::Parse() { serviceLoop.setData(data+sizeof(descr_nvod_reference), getLength()-sizeof(descr_nvod_reference)); } - - - int NVODReferenceDescriptor::Service::getTransportStream() const { return HILO(s->transport_stream_id); } @@ -430,9 +372,6 @@ void NVODReferenceDescriptor::Service::Parse() { s=data.getData(); } - - - int TimeShiftedServiceDescriptor::getReferenceServiceId() const { return HILO(s->reference_service_id); } @@ -441,9 +380,6 @@ void TimeShiftedServiceDescriptor::Parse() { s=data.getData(); } - - - int ComponentDescriptor::getStreamContent() const { return s->stream_content; } @@ -465,16 +401,10 @@ void ComponentDescriptor::Parse() { description.setData(data+offset, getLength()-offset); } - - - void SubtitlingDescriptor::Parse() { subtitlingLoop.setData(data+sizeof(descr_subtitling), getLength()-sizeof(descr_subtitling)); } - - - int SubtitlingDescriptor::Subtitling::getSubtitlingType() const { return s->subtitling_type; } @@ -491,9 +421,6 @@ void SubtitlingDescriptor::Subtitling::Parse() { s=data.getData(); } - - - int ServiceMoveDescriptor::getNewOriginalNetworkId() const { return HILO(s->new_original_network_id); } @@ -510,9 +437,6 @@ void ServiceMoveDescriptor::Parse() { s=data.getData(); } - - - int FrequencyListDescriptor::getCodingType() const { return s->coding_type; } @@ -523,19 +447,14 @@ void FrequencyListDescriptor::Parse() { frequencies.setData(data+offset, getLength()-offset); } - - - void ServiceIdentifierDescriptor::Parse() { textualServiceIdentifier.setData(data+sizeof(descr_service_identifier), getLength()-sizeof(descr_service_identifier)); } - void MultilingualNameDescriptor::Parse() { nameLoop.setData(data+sizeof(descr_multilingual_network_name), getLength()-sizeof(descr_multilingual_network_name)); } - void MultilingualNameDescriptor::Name::Parse() { unsigned int offset=0; const entry_multilingual_name *s; @@ -546,7 +465,6 @@ void MultilingualNameDescriptor::Name::Parse() { name.setData(data+offset, s->text_length); } - int MultilingualComponentDescriptor::getComponentTag() const { return s->component_tag; } @@ -554,19 +472,13 @@ int MultilingualComponentDescriptor::getComponentTag() const { void MultilingualComponentDescriptor::Parse() { unsigned int offset=0; data.setPointerAndOffset(s, offset); - nameLoop.setData(data+sizeof(descr_multilingual_component), getLength()-sizeof(descr_multilingual_component)); + nameLoop.setData(data+sizeof(descr_multilingual_component), getLength()-sizeof(descr_multilingual_component)); } - - - void MultilingualServiceNameDescriptor::Parse() { nameLoop.setData(data+sizeof(descr_multilingual_network_name), getLength()-sizeof(descr_multilingual_network_name)); } - - - void MultilingualServiceNameDescriptor::Name::Parse() { unsigned int offset=0; const entry_multilingual_name *s; @@ -580,9 +492,6 @@ void MultilingualServiceNameDescriptor::Name::Parse() { name.setData(data+offset, mid->service_name_length); } - - - void ApplicationSignallingDescriptor::Parse() { entryLoop.setData(data+sizeof(descr_application_signalling), getLength()-sizeof(descr_application_signalling)); } @@ -599,10 +508,6 @@ void ApplicationSignallingDescriptor::ApplicationEntryDescriptor::Parse() { s=data.getData(); } - - - - bool MHP_ApplicationDescriptor::isServiceBound() const { return s->service_bound_flag; } @@ -615,7 +520,6 @@ int MHP_ApplicationDescriptor::getApplicationPriority() const { return s->application_priority; } - void MHP_ApplicationDescriptor::Parse() { unsigned int offset=0; const descr_application *dapp; @@ -625,7 +529,6 @@ void MHP_ApplicationDescriptor::Parse() { transportProtocolLabels.setData(data+offset, getLength()-offset); } - int MHP_ApplicationDescriptor::Profile::getApplicationProfile() const { return HILO(s->application_profile); } @@ -646,8 +549,6 @@ void MHP_ApplicationDescriptor::Profile::Parse() { s=data.getData(); } - - void MHP_ApplicationNameDescriptor::Parse() { nameLoop.setData(data+sizeof(descr_application_name), getLength()-sizeof(descr_application_name)); } @@ -661,8 +562,6 @@ void MHP_ApplicationNameDescriptor::NameEntry::Parse() { languageCode[2]=s->lang_code3; } - - int MHP_TransportProtocolDescriptor::getProtocolId() const { return HILO(s->protocol_id); } @@ -701,8 +600,6 @@ void MHP_TransportProtocolDescriptor::Parse() { } } - - void MHP_DVBJApplicationDescriptor::Parse() { applicationLoop.setData(data+sizeof(descr_dvbj_application), getLength()-sizeof(descr_dvbj_application)); } @@ -712,7 +609,6 @@ void MHP_DVBJApplicationDescriptor::ApplicationEntry::Parse() { parameter.setData(data+sizeof(descr_dvbj_application_entry), entry->parameter_length); } - void MHP_DVBJApplicationLocationDescriptor::Parse() { unsigned int offset=0; const descr_dvbj_application_location *first; @@ -724,7 +620,6 @@ void MHP_DVBJApplicationLocationDescriptor::Parse() { initialClass.setData(data+offset, getLength()-offset); } - int MHP_ApplicationIconsDescriptor::getIconFlags() const { return HILO(s->icon_flags); } @@ -738,5 +633,3 @@ void MHP_ApplicationIconsDescriptor::Parse() { } } //end of namespace - - -- cgit v1.2.3