use libdvbsi++ from tuxbox-cvs,
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 30 Sep 2005 19:32:54 +0000 (19:32 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 30 Sep 2005 19:32:54 +0000 (19:32 +0000)
please add http://ghost.dream-multimedia-tv.de/libdvbsi++.bb to your bitbake/openembedded/packages/tuxbox directory and exectute "bitbake -b ../openembedded/packages/tuxbox/libdvbsi++.bb" then install the libdvbsi++...ipk

186 files changed:
acinclude.m4
configure.ac
lib/Makefile.am
lib/dvb/db.cpp
lib/dvb/db.h
lib/dvb/demux.h
lib/dvb/dvbtime.cpp
lib/dvb/dvbtime.h
lib/dvb/eit.cpp
lib/dvb/eit.h
lib/dvb/frontend.cpp
lib/dvb/idvb.h
lib/dvb/pmt.cpp
lib/dvb/pmt.h
lib/dvb/scan.cpp
lib/dvb/scan.h
lib/dvb/specs.h
lib/dvb_si/.cvsignore [deleted file]
lib/dvb_si/Makefile.am [deleted file]
lib/dvb_si/ac3_descriptor.cpp [deleted file]
lib/dvb_si/ac3_descriptor.h [deleted file]
lib/dvb_si/ait.cpp [deleted file]
lib/dvb_si/ait.h [deleted file]
lib/dvb_si/ancillary_data_descriptor.cpp [deleted file]
lib/dvb_si/ancillary_data_descriptor.h [deleted file]
lib/dvb_si/announcement_support_descriptor.cpp [deleted file]
lib/dvb_si/announcement_support_descriptor.h [deleted file]
lib/dvb_si/application_signalling_descriptor.cpp [deleted file]
lib/dvb_si/application_signalling_descriptor.h [deleted file]
lib/dvb_si/audio_stream_descriptor.cpp [deleted file]
lib/dvb_si/audio_stream_descriptor.h [deleted file]
lib/dvb_si/bat.cpp [deleted file]
lib/dvb_si/bat.h [deleted file]
lib/dvb_si/bouquet_name_descriptor.cpp [deleted file]
lib/dvb_si/bouquet_name_descriptor.h [deleted file]
lib/dvb_si/ca_descriptor.cpp [deleted file]
lib/dvb_si/ca_descriptor.h [deleted file]
lib/dvb_si/ca_identifier_descriptor.cpp [deleted file]
lib/dvb_si/ca_identifier_descriptor.h [deleted file]
lib/dvb_si/ca_system_descriptor.cpp [deleted file]
lib/dvb_si/ca_system_descriptor.h [deleted file]
lib/dvb_si/cable_delivery_system_descriptor.cpp [deleted file]
lib/dvb_si/cable_delivery_system_descriptor.h [deleted file]
lib/dvb_si/camt.cpp [deleted file]
lib/dvb_si/camt.h [deleted file]
lib/dvb_si/capmt.cpp [deleted file]
lib/dvb_si/capmt.h [deleted file]
lib/dvb_si/cat.cpp [deleted file]
lib/dvb_si/cat.h [deleted file]
lib/dvb_si/cell_frequency_link_descriptor.cpp [deleted file]
lib/dvb_si/cell_frequency_link_descriptor.h [deleted file]
lib/dvb_si/cell_list_descriptor.cpp [deleted file]
lib/dvb_si/cell_list_descriptor.h [deleted file]
lib/dvb_si/component_descriptor.cpp [deleted file]
lib/dvb_si/component_descriptor.h [deleted file]
lib/dvb_si/container.cpp [deleted file]
lib/dvb_si/container.h [deleted file]
lib/dvb_si/content_descriptor.cpp [deleted file]
lib/dvb_si/content_descriptor.h [deleted file]
lib/dvb_si/copyright_descriptor.h [deleted file]
lib/dvb_si/country_availability_descriptor.cpp [deleted file]
lib/dvb_si/country_availability_descriptor.h [deleted file]
lib/dvb_si/data_broadcast_descriptor.cpp [deleted file]
lib/dvb_si/data_broadcast_descriptor.h [deleted file]
lib/dvb_si/data_broadcast_id_descriptor.cpp [deleted file]
lib/dvb_si/data_broadcast_id_descriptor.h [deleted file]
lib/dvb_si/data_stream_alignment_descriptor.h [deleted file]
lib/dvb_si/descriptor.cpp [deleted file]
lib/dvb_si/descriptor.h [deleted file]
lib/dvb_si/descriptor_tag.h [deleted file]
lib/dvb_si/dsng_descriptor.h [deleted file]
lib/dvb_si/eit.cpp [deleted file]
lib/dvb_si/eit.h [deleted file]
lib/dvb_si/element_descriptor.h [deleted file]
lib/dvb_si/extended_event_descriptor.cpp [deleted file]
lib/dvb_si/extended_event_descriptor.h [deleted file]
lib/dvb_si/frequency_list_descriptor.cpp [deleted file]
lib/dvb_si/frequency_list_descriptor.h [deleted file]
lib/dvb_si/group_descriptor.h [deleted file]
lib/dvb_si/hierarchy_descriptor.h [deleted file]
lib/dvb_si/ibp_descriptor.h [deleted file]
lib/dvb_si/ippv_booking_descriptor.h [deleted file]
lib/dvb_si/ippv_descriptor.h [deleted file]
lib/dvb_si/iso639_language_descriptor.cpp [deleted file]
lib/dvb_si/iso639_language_descriptor.h [deleted file]
lib/dvb_si/linkage_descriptor.cpp [deleted file]
lib/dvb_si/linkage_descriptor.h [deleted file]
lib/dvb_si/local_time_offset_descriptor.cpp [deleted file]
lib/dvb_si/local_time_offset_descriptor.h [deleted file]
lib/dvb_si/long_crc_table.cpp [deleted file]
lib/dvb_si/long_crc_table.h [deleted file]
lib/dvb_si/long_table.cpp [deleted file]
lib/dvb_si/long_table.h [deleted file]
lib/dvb_si/maximum_bitrate_descriptor.h [deleted file]
lib/dvb_si/mosaic_descriptor.cpp [deleted file]
lib/dvb_si/mosaic_descriptor.h [deleted file]
lib/dvb_si/multilingual_bouquet_name_descriptor.cpp [deleted file]
lib/dvb_si/multilingual_bouquet_name_descriptor.h [deleted file]
lib/dvb_si/multilingual_component_descriptor.cpp [deleted file]
lib/dvb_si/multilingual_component_descriptor.h [deleted file]
lib/dvb_si/multilingual_network_name_descriptor.cpp [deleted file]
lib/dvb_si/multilingual_network_name_descriptor.h [deleted file]
lib/dvb_si/multilingual_service_name_descriptor.cpp [deleted file]
lib/dvb_si/multilingual_service_name_descriptor.h [deleted file]
lib/dvb_si/multiplex_buffer_utilization_descriptor.h [deleted file]
lib/dvb_si/network_name_descriptor.cpp [deleted file]
lib/dvb_si/network_name_descriptor.h [deleted file]
lib/dvb_si/nit.cpp [deleted file]
lib/dvb_si/nit.h [deleted file]
lib/dvb_si/nvod_reference_descriptor.cpp [deleted file]
lib/dvb_si/nvod_reference_descriptor.h [deleted file]
lib/dvb_si/packet_id.h [deleted file]
lib/dvb_si/parental_rating_descriptor.cpp [deleted file]
lib/dvb_si/parental_rating_descriptor.h [deleted file]
lib/dvb_si/partial_transport_stream_descriptor.h [deleted file]
lib/dvb_si/pat.cpp [deleted file]
lib/dvb_si/pat.h [deleted file]
lib/dvb_si/pdc_descriptor.cpp [deleted file]
lib/dvb_si/pdc_descriptor.h [deleted file]
lib/dvb_si/pmt.cpp [deleted file]
lib/dvb_si/pmt.h [deleted file]
lib/dvb_si/private_data_indicator_descriptor.h [deleted file]
lib/dvb_si/private_data_specifier_descriptor.cpp [deleted file]
lib/dvb_si/private_data_specifier_descriptor.h [deleted file]
lib/dvb_si/registration_descriptor.h [deleted file]
lib/dvb_si/satellite_delivery_system_descriptor.cpp [deleted file]
lib/dvb_si/satellite_delivery_system_descriptor.h [deleted file]
lib/dvb_si/sdt.cpp [deleted file]
lib/dvb_si/sdt.h [deleted file]
lib/dvb_si/service_descriptor.cpp [deleted file]
lib/dvb_si/service_descriptor.h [deleted file]
lib/dvb_si/service_list_descriptor.cpp [deleted file]
lib/dvb_si/service_list_descriptor.h [deleted file]
lib/dvb_si/service_move_descriptor.cpp [deleted file]
lib/dvb_si/service_move_descriptor.h [deleted file]
lib/dvb_si/service_type.h [deleted file]
lib/dvb_si/short_crc_table.cpp [deleted file]
lib/dvb_si/short_crc_table.h [deleted file]
lib/dvb_si/short_event_descriptor.cpp [deleted file]
lib/dvb_si/short_event_descriptor.h [deleted file]
lib/dvb_si/short_smoothing_buffer_descriptor.h [deleted file]
lib/dvb_si/short_table.cpp [deleted file]
lib/dvb_si/short_table.h [deleted file]
lib/dvb_si/smoothing_buffer_descriptor.h [deleted file]
lib/dvb_si/std_descriptor.h [deleted file]
lib/dvb_si/stream_identifier_descriptor.cpp [deleted file]
lib/dvb_si/stream_identifier_descriptor.h [deleted file]
lib/dvb_si/stream_type.h [deleted file]
lib/dvb_si/stuffing_descriptor.cpp [deleted file]
lib/dvb_si/stuffing_descriptor.h [deleted file]
lib/dvb_si/subtitling_descriptor.cpp [deleted file]
lib/dvb_si/subtitling_descriptor.h [deleted file]
lib/dvb_si/system_clock_descriptor.h [deleted file]
lib/dvb_si/table_id.h [deleted file]
lib/dvb_si/target_background_grid_descriptor.cpp [deleted file]
lib/dvb_si/target_background_grid_descriptor.h [deleted file]
lib/dvb_si/tdt.cpp [deleted file]
lib/dvb_si/tdt.h [deleted file]
lib/dvb_si/telephone_descriptor.cpp [deleted file]
lib/dvb_si/telephone_descriptor.h [deleted file]
lib/dvb_si/teletext_descriptor.cpp [deleted file]
lib/dvb_si/teletext_descriptor.h [deleted file]
lib/dvb_si/terrestrial_delivery_system_descriptor.cpp [deleted file]
lib/dvb_si/terrestrial_delivery_system_descriptor.h [deleted file]
lib/dvb_si/time_shifted_event_descriptor.h [deleted file]
lib/dvb_si/time_shifted_service_descriptor.cpp [deleted file]
lib/dvb_si/time_shifted_service_descriptor.h [deleted file]
lib/dvb_si/tot.cpp [deleted file]
lib/dvb_si/tot.h [deleted file]
lib/dvb_si/transport_stream_descriptor.h [deleted file]
lib/dvb_si/url_descriptor.h [deleted file]
lib/dvb_si/vbi_data_descriptor.cpp [deleted file]
lib/dvb_si/vbi_data_descriptor.h [deleted file]
lib/dvb_si/vbi_teletext_descriptor.cpp [deleted file]
lib/dvb_si/vbi_teletext_descriptor.h [deleted file]
lib/dvb_si/video_stream_descriptor.cpp [deleted file]
lib/dvb_si/video_stream_descriptor.h [deleted file]
lib/dvb_si/video_window_descriptor.cpp [deleted file]
lib/dvb_si/video_window_descriptor.h [deleted file]
lib/network/serversocket.lo
lib/network/socket.lo
lib/service/event.cpp
main/Makefile.am
main/enigma-dvbtest.cpp
main/enigma-playlist.cpp
main/enigma-scan.cpp

index 0dcafde..b92d02f 100644 (file)
@@ -125,7 +125,7 @@ TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
 TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
        [--with-gamesdir=PATH    ],[where games data is stored])
 
-TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,,
+TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
        [--with-libdir=PATH      ],[where to find the internal libs])
 
 TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
index eacbf2d..e598b76 100644 (file)
@@ -29,6 +29,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 #TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)
 TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2)
+TUXBOX_APPS_LIB_PKGCONFIG(DVBSI,libdvbsi++)
 #TUXBOX_APPS_LIB_PKGCONFIG(XMLTREE,tuxbox-xmltree)
 if test "$withsdl" = "yes" ; then
        TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
@@ -36,7 +37,7 @@ if test "$withsdl" = "yes" ; then
 fi
 
 # fixme: decent python stuff
-CPPFLAGS="$CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS -I$PYTHON_INCDIR -DHAVE_CPP_FILT -DMEMLEAK_CHECK"
+CPPFLAGS="$CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS -I$PYTHON_INCDIR -DHAVE_CPP_FILT -DMEMLEAK_CHECK"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
 LDFLAGS="$LDFLAGS -rdynamic"
 
@@ -51,7 +52,6 @@ lib/base/Makefile
 lib/driver/Makefile
 lib/dvb/Makefile
 lib/dvb_ci/Makefile
-lib/dvb_si/Makefile
 lib/gdi/Makefile
 lib/gui/Makefile
 lib/nav/Makefile
index 8d07ec9..4372ccb 100644 (file)
@@ -1 +1 @@
-SUBDIRS = actions base components dvb dvb_ci dvb_si gdi network service driver nav gui python
+SUBDIRS = actions base components dvb dvb_ci gdi network service driver nav gui python
index 13bb900..fdcd428 100644 (file)
@@ -3,10 +3,10 @@
 #include <lib/dvb/frontend.h>
 #include <lib/base/eerror.h>
 #include <lib/base/estring.h>
-#include <lib/dvb_si/sdt.h>
-#include <lib/dvb_si/descriptor_tag.h>
-#include <lib/dvb_si/service_descriptor.h>
-#include <lib/dvb_si/satellite_delivery_system_descriptor.h>
+#include <dvbsi++/service_description_section.h>
+#include <dvbsi++/descriptor_tag.h>
+#include <dvbsi++/service_descriptor.h>
+#include <dvbsi++/satellite_delivery_system_descriptor.h>
 
 DEFINE_REF(eDVBService);
 
index 3db7228..084c877 100644 (file)
@@ -4,7 +4,7 @@
 #include <lib/dvb/idvb.h>
 #include <set>
 
-class ServiceDescriptionTable;
+class ServiceDescriptionSection;
 
 struct eDVBBouquet
 {
index 23aef0f..a01cf60 100644 (file)
@@ -14,6 +14,7 @@ class eDVBDemux: public iDVBDemux
        friend class eDVBVideo;
        friend class eDVBPCR;
        friend class eDVBTSRecorder;
+       friend class eDVBCAService;
 public:
        DECLARE_REF(eDVBDemux);
        eDVBDemux(int adapter, int demux);
@@ -22,6 +23,7 @@ public:
        RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
        RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
        RESULT getSTC(pts_t &pts);
+       RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }
 };
 
 class eDVBSectionReader: public iDVBSectionReader, public Object
index 795b524..82ceffd 100644 (file)
@@ -97,10 +97,10 @@ void TDT::start()
        if ( chan )
        {
                eDVBTableSpec spec;
-               spec.pid = TimeAndDateTable::PID;
-               spec.tid = TimeAndDateTable::TID;
+               spec.pid = TimeAndDateSection::PID;
+               spec.tid = TimeAndDateSection::TID;
                spec.tid_mask = 0xFC;
-               spec.timeout = TimeAndDateTable::TIMEOUT;
+               spec.timeout = TimeAndDateSection::TIMEOUT;
                spec.flags= eDVBTableSpec::tfAnyVersion |
                                        eDVBTableSpec::tfHaveTID |
                                        eDVBTableSpec::tfHaveTIDMask |
index 3b92fd1..fbc82f0 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <lib/base/eerror.h>
 #include <lib/dvb/esection.h>
-#include <lib/dvb_si/tdt.h>
+#include <dvbsi++/time_date_section.h>
 
 class eDVBChannel;
 
index 2462d33..b78b227 100644 (file)
@@ -7,11 +7,11 @@ void eDVBServiceEITHandler::EITready(int error)
 {
        if (!error)
        {
-               ePtr<eTable<EventInformationTable> > ptr;
+               ePtr<eTable<EventInformationSection> > ptr;
                if (!m_EIT.getCurrent(ptr))
                {
                        int a = 0;
-                       for (EventInformationTableConstIterator i = ptr->getSections().begin();
+                       for (std::vector<EventInformationSection*>::const_iterator i = ptr->getSections().begin();
                                i != ptr->getSections().end(); ++i)
                        {
                                for (EventConstIterator ev = (*i)->getEvents()->begin(); ev != (*i)->getEvents()->end(); ++ev)
index a026773..43bdb6b 100644 (file)
@@ -3,13 +3,13 @@
 
 #include <lib/dvb/idemux.h>
 #include <lib/dvb/esection.h>
-#include <lib/dvb_si/eit.h>
+#include <dvbsi++/event_information_section.h>
 #include <lib/service/event.h>
 
 class eDVBServiceEITHandler: public Object
 {
        ePtr<iDVBDemux> m_demux;
-       eAUTable<eTable<EventInformationTable> > m_EIT;
+       eAUTable<eTable<EventInformationSection> > m_EIT;
        void EITready(int error);
        
        RESULT parseEvent(ePtr<eServiceEvent> &serviceevent, const Event &dvbevent);
index d4704a9..6951983 100644 (file)
@@ -23,9 +23,9 @@
 #include <linux/dvb/frontend.h>
 #endif
 
-#include <lib/dvb_si/satellite_delivery_system_descriptor.h>
-#include <lib/dvb_si/cable_delivery_system_descriptor.h>
-#include <lib/dvb_si/terrestrial_delivery_system_descriptor.h>
+#include <dvbsi++/satellite_delivery_system_descriptor.h>
+#include <dvbsi++/cable_delivery_system_descriptor.h>
+#include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
 void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
 {
index 683a7b7..add9ba8 100644 (file)
@@ -476,6 +476,7 @@ public:
        virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
        virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
        virtual RESULT getSTC(pts_t &pts)=0;
+       virtual RESULT getCADemuxID(uint8_t &id)=0;
 };
 
 class iTSMPEGDecoder: public iObject
index e62de9b..57e617c 100644 (file)
@@ -50,14 +50,14 @@ void eDVBServicePMTHandler::PMTready(int error)
 void eDVBServicePMTHandler::PATready(int)
 {
        eDebug("got PAT");
-       ePtr<eTable<ProgramAssociationTable> > ptr;
+       ePtr<eTable<ProgramAssociationSection> > ptr;
        if (!m_PAT.getCurrent(ptr))
        {
                int pmtpid = -1;
-               ProgramAssociationTableConstIterator i;
+               std::vector<ProgramAssociationSection*>::const_iterator i;
                for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
                {
-                       const ProgramAssociationTable &pat = **i;
+                       const ProgramAssociationSection &pat = **i;
                        ProgramAssociationConstIterator program;
                        for (program = pat.getPrograms()->begin(); program != pat.getPrograms()->end(); ++program)
                                if (eServiceID((*program)->getProgramNumber()) == m_reference.getServiceID())
@@ -74,7 +74,7 @@ void eDVBServicePMTHandler::PATready(int)
 int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 {
        eDebug("got PMT");
-       ePtr<eTable<ProgramMapTable> > ptr;
+       ePtr<eTable<ProgramMapSection> > ptr;
 
        program.videoStreams.clear();
        program.audioStreams.clear();
@@ -82,10 +82,10 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 
        if (!m_PMT.getCurrent(ptr))
        {
-               ProgramMapTableConstIterator i;
+               std::vector<ProgramMapSection*>::const_iterator i;
                for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
                {
-                       const ProgramMapTable &pmt = **i;
+                       const ProgramMapSection &pmt = **i;
                        program.pcrPid = pmt.getPcrPid();
                        
                        ElementaryStreamInfoConstIterator es;
index efe54ee..2d47852 100644 (file)
@@ -5,8 +5,8 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/idemux.h>
 #include <lib/dvb/esection.h>
-#include <lib/dvb_si/pmt.h>
-#include <lib/dvb_si/pat.h>
+#include <dvbsi++/program_map_section.h>
+#include <dvbsi++/program_association_section.h>
 
 class eDVBServicePMTHandler: public Object
 {
@@ -15,8 +15,8 @@ class eDVBServicePMTHandler: public Object
 
        int m_last_channel_state;
        
-       eAUTable<eTable<ProgramMapTable> > m_PMT;
-       eAUTable<eTable<ProgramAssociationTable> > m_PAT;
+       eAUTable<eTable<ProgramMapSection> > m_PMT;
+       eAUTable<eTable<ProgramAssociationSection> > m_PAT;
 
        eUsePtr<iDVBChannel> m_channel;
        eUsePtr<iDVBPVRChannel> m_pvr_channel;
index 7e60331..11b4e7c 100644 (file)
@@ -1,11 +1,11 @@
 #include <lib/dvb/idvb.h>
-#include <lib/dvb_si/sdt.h>
-#include <lib/dvb_si/nit.h>
-#include <lib/dvb_si/bat.h>
-#include <lib/dvb_si/descriptor_tag.h>
-#include <lib/dvb_si/service_descriptor.h>
-#include <lib/dvb_si/satellite_delivery_system_descriptor.h>
-#include <lib/dvb_si/ca_identifier_descriptor.h>
+#include <dvbsi++/service_description_section.h>
+#include <dvbsi++/network_information_section.h>
+#include <dvbsi++/bouquet_association_section.h>
+#include <dvbsi++/descriptor_tag.h>
+#include <dvbsi++/service_descriptor.h>
+#include <dvbsi++/satellite_delivery_system_descriptor.h>
+#include <dvbsi++/ca_identifier_descriptor.h>
 #include <lib/dvb/specs.h>
 #include <lib/dvb/esection.h>
 #include <lib/dvb/scan.h>
@@ -119,18 +119,18 @@ RESULT eDVBScan::startFilter()
 {
        assert(m_demux);
        
-       m_SDT = new eTable<ServiceDescriptionTable>();
+       m_SDT = new eTable<ServiceDescriptionSection>();
        if (m_SDT->start(m_demux, eDVBSDTSpec()))
                return -1;
        CONNECT(m_SDT->tableReady, eDVBScan::SDTready);
 
        m_NIT = 0;
-       m_NIT = new eTable<NetworkInformationTable>();
+       m_NIT = new eTable<NetworkInformationSection>();
        if (m_NIT->start(m_demux, eDVBNITSpec()))
                return -1;
        CONNECT(m_NIT->tableReady, eDVBScan::NITready);
        
-       m_BAT = new eTable<BouquetAssociationTable>();
+       m_BAT = new eTable<BouquetAssociationSection>();
        if (m_BAT->start(m_demux, eDVBBATSpec()))
                return -1;
        CONNECT(m_BAT->tableReady, eDVBScan::BATready);
@@ -222,7 +222,7 @@ void eDVBScan::channelDone()
                        hash);
                
                SCAN_eDebug("SDT: ");
-               ServiceDescriptionTableConstIterator i;
+               std::vector<ServiceDescriptionSection*>::const_iterator i;
                for (i = m_SDT->getSections().begin(); i != m_SDT->getSections().end(); ++i)
                        processSDT(dvbnamespace, **i);
                m_ready &= ~validSDT;
@@ -231,10 +231,10 @@ void eDVBScan::channelDone()
        if (m_ready & validNIT)
        {
                SCAN_eDebug("dumping NIT");
-               NetworkInformationTableConstIterator i;
+               std::vector<NetworkInformationSection*>::const_iterator i;
                for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i)
                {
-                       const TransportStreamInfoVector &tsinfovec = *(*i)->getTsInfo();
+                       const TransportStreamInfoList &tsinfovec = *(*i)->getTsInfo();
                        
                        for (TransportStreamInfoConstIterator tsinfo(tsinfovec.begin()); 
                                tsinfo != tsinfovec.end(); ++tsinfo)
@@ -353,9 +353,9 @@ void eDVBScan::insertInto(iDVBChannelList *db)
        }
 }
 
-RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt)
+RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt)
 {
-       const ServiceDescriptionVector &services = *sdt.getDescriptions();
+       const ServiceDescriptionList &services = *sdt.getDescriptions();
        SCAN_eDebug("ONID: %04x", sdt.getOriginalNetworkId());
        eDVBChannelID chid(dvbnamespace, sdt.getTransportStreamId(), sdt.getOriginalNetworkId());
        
@@ -394,9 +394,9 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription
                        case CA_IDENTIFIER_DESCRIPTOR:
                        {
                                CaIdentifierDescriptor &d = (CaIdentifierDescriptor&)**desc;
-                               const CaSystemIdVector &caids = *d.getCaSystemIds();
+                               const CaSystemIdList &caids = *d.getCaSystemIds();
                                SCAN_eDebugNoNewLine("CA ");
-                               for (CaSystemIdVector::const_iterator i(caids.begin()); i != caids.end(); ++i)
+                               for (CaSystemIdList::const_iterator i(caids.begin()); i != caids.end(); ++i)
                                {
                                        SCAN_eDebugNoNewLine("%04x ", *i);
                                        service->m_ca.insert(*i);
index 743ea8d..6abc1d0 100644 (file)
@@ -1,9 +1,9 @@
 #ifndef __lib_dvb_scan_h
 #define __lib_dvb_scan_h
 
-#include <lib/dvb_si/nit.h>
-#include <lib/dvb_si/sdt.h>
-#include <lib/dvb_si/bat.h>
+#include <dvbsi++/network_information_section.h>
+#include <dvbsi++/service_description_section.h>
+#include <dvbsi++/bouquet_association_section.h>
 #include <lib/dvb/idemux.h>
 #include <lib/dvb/esection.h>
 #include <lib/dvb/db.h>
@@ -45,9 +45,9 @@ private:
        ePtr<iDVBFrontendParameters> m_ch_current;
        eDVBChannelID m_chid_current;
        
-       ePtr<eTable<ServiceDescriptionTable> > m_SDT;
-       ePtr<eTable<NetworkInformationTable> > m_NIT;
-       ePtr<eTable<BouquetAssociationTable> > m_BAT;
+       ePtr<eTable<ServiceDescriptionSection> > m_SDT;
+       ePtr<eTable<NetworkInformationSection> > m_NIT;
+       ePtr<eTable<BouquetAssociationSection> > m_BAT;
        
        void SDTready(int err);
        void NITready(int err);
@@ -60,7 +60,7 @@ private:
        void channelDone();
        
        Signal1<void,int> m_event;
-       RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt);
+       RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt);
 public:
        eDVBScan(iDVBChannel *channel);
        ~eDVBScan();
index 2e2eed9..23ef2ce 100644 (file)
@@ -3,12 +3,12 @@
 
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/idemux.h>
-#include <lib/dvb_si/pmt.h>
-#include <lib/dvb_si/sdt.h>
-#include <lib/dvb_si/nit.h>
-#include <lib/dvb_si/bat.h>
-#include <lib/dvb_si/pat.h>
-#include <lib/dvb_si/eit.h>
+#include <dvbsi++/program_map_section.h>
+#include <dvbsi++/service_description_section.h>
+#include <dvbsi++/network_information_section.h>
+#include <dvbsi++/bouquet_association_section.h>
+#include <dvbsi++/program_association_section.h>
+#include <dvbsi++/event_information_section.h>
 
 struct eDVBPMTSpec
 {
@@ -17,9 +17,9 @@ public:
        eDVBPMTSpec(int pid, int sid)
        {
                m_spec.pid     = pid;
-               m_spec.tid     = ProgramMapTable::TID;
+               m_spec.tid     = ProgramMapSection::TID;
                m_spec.tidext  = sid;
-               m_spec.timeout = 20000; // ProgramMapTable::TIMEOUT;
+               m_spec.timeout = 20000; // ProgramMapSection::TIMEOUT;
                m_spec.flags   = eDVBTableSpec::tfAnyVersion | 
                        eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfHaveTIDExt | 
                        eDVBTableSpec::tfCheckCRC | eDVBTableSpec::tfHaveTimeout;
@@ -36,9 +36,9 @@ struct eDVBSDTSpec
 public:
        eDVBSDTSpec()
        {
-               m_spec.pid     = ServiceDescriptionTable::PID;
-               m_spec.tid     = ServiceDescriptionTable::TID;
-               m_spec.timeout = 20000; // ServiceDescriptionTable::TIMEOUT;
+               m_spec.pid     = ServiceDescriptionSection::PID;
+               m_spec.tid     = ServiceDescriptionSection::TID;
+               m_spec.timeout = 20000; // ServiceDescriptionSection::TIMEOUT;
                m_spec.flags   = eDVBTableSpec::tfAnyVersion |
                        eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
                        eDVBTableSpec::tfHaveTimeout;
@@ -55,9 +55,9 @@ struct eDVBNITSpec
 public:
        eDVBNITSpec()
        {
-               m_spec.pid     = NetworkInformationTable::PID;
-               m_spec.tid     = NetworkInformationTable::TID;
-               m_spec.timeout = NetworkInformationTable::TIMEOUT;
+               m_spec.pid     = NetworkInformationSection::PID;
+               m_spec.tid     = NetworkInformationSection::TID;
+               m_spec.timeout = NetworkInformationSection::TIMEOUT;
                m_spec.flags   = eDVBTableSpec::tfAnyVersion |
                        eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
                        eDVBTableSpec::tfHaveTimeout;
@@ -74,9 +74,9 @@ struct eDVBBATSpec
 public:
        eDVBBATSpec()
        {
-               m_spec.pid     = BouquetAssociationTable::PID;
-               m_spec.tid     = BouquetAssociationTable::TID;
-               m_spec.timeout = BouquetAssociationTable::TIMEOUT;
+               m_spec.pid     = BouquetAssociationSection::PID;
+               m_spec.tid     = BouquetAssociationSection::TID;
+               m_spec.timeout = BouquetAssociationSection::TIMEOUT;
                m_spec.flags   = eDVBTableSpec::tfAnyVersion |
                        eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
                        eDVBTableSpec::tfHaveTimeout;
@@ -93,9 +93,9 @@ struct eDVBPATSpec
 public:
        eDVBPATSpec()
        {
-               m_spec.pid     = ProgramAssociationTable::PID;
-               m_spec.tid     = ProgramAssociationTable::TID;
-               m_spec.timeout = 20000; // ProgramAssociationTable::TIMEOUT;
+               m_spec.pid     = ProgramAssociationSection::PID;
+               m_spec.tid     = ProgramAssociationSection::TID;
+               m_spec.timeout = 20000; // ProgramAssociationSection::TIMEOUT;
                m_spec.flags   = eDVBTableSpec::tfAnyVersion |
                        eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
                        eDVBTableSpec::tfHaveTimeout;
@@ -113,10 +113,10 @@ public:
                /* this is for now&next on actual transponder. */
        eDVBEITSpec(int sid)
        {
-               m_spec.pid     = EventInformationTable::PID;
-               m_spec.tid     = EventInformationTable::TID;
+               m_spec.pid     = EventInformationSection::PID;
+               m_spec.tid     = EventInformationSection::TID;
                m_spec.tidext  = sid;
-               m_spec.timeout = EventInformationTable::TIMEOUT;
+               m_spec.timeout = EventInformationSection::TIMEOUT;
                m_spec.flags   = eDVBTableSpec::tfAnyVersion | 
                        eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfHaveTIDExt |
                        eDVBTableSpec::tfCheckCRC | eDVBTableSpec::tfHaveTimeout;
diff --git a/lib/dvb_si/.cvsignore b/lib/dvb_si/.cvsignore
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/lib/dvb_si/Makefile.am b/lib/dvb_si/Makefile.am
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/lib/dvb_si/ac3_descriptor.cpp b/lib/dvb_si/ac3_descriptor.cpp
deleted file mode 100644 (file)
index a4f5d63..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * $Id: ac3_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/ac3_descriptor.h>
-
-Ac3Descriptor::Ac3Descriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       if (buffer[1] >= 1)
-       {
-               ac3TypeFlag = (buffer[2] >> 7) & 0x01;
-               bsidFlag = (buffer[2] >> 6) & 0x01;
-               mainidFlag = (buffer[2] >> 5) & 0x01;
-               asvcFlag = (buffer[2] >> 4) & 0x01;
-               reserved = buffer[2] & 0x0F;
-               if (ac3TypeFlag == 1)
-                       ac3Type = buffer[3];
-
-               if (bsidFlag == 1)
-                       bsid = buffer[ac3TypeFlag + 3];
-
-               if (mainidFlag == 1)
-                       mainid = buffer[ac3TypeFlag + mainidFlag + 3];
-
-               if (asvcFlag == 1)
-                       avsc = buffer[ac3TypeFlag + bsidFlag + mainidFlag + 3];
-               
-               if (descriptorLength > ac3TypeFlag + bsidFlag + mainidFlag + asvcFlag)
-                       for (uint16_t i = 0; i < descriptorLength - ac3TypeFlag - bsidFlag - mainidFlag - asvcFlag - 1; ++i)
-                               additionalInfo.push_back(buffer[ac3TypeFlag + bsidFlag + mainidFlag + asvcFlag + i + 3]);
-       } else
-       {
-               ac3TypeFlag = 0;
-               bsidFlag = 0;
-               mainidFlag = 0;
-               asvcFlag = 0;
-               reserved = 0;
-       }
-}
-
-uint8_t Ac3Descriptor::getAc3TypeFlag(void) const
-{
-       return ac3TypeFlag;
-}
-
-uint8_t Ac3Descriptor::getBsidFlag(void) const
-{
-       return bsidFlag;
-}
-
-uint8_t Ac3Descriptor::getMainidFlag(void) const
-{
-       return mainidFlag;
-}
-
-uint8_t Ac3Descriptor::getAsvcFlag(void) const
-{
-       return asvcFlag;
-}
-
-uint8_t Ac3Descriptor::getAc3Type(void) const
-{
-       return ac3Type;
-}
-
-uint8_t Ac3Descriptor::getBsid(void) const
-{
-       return bsid;
-}
-
-uint8_t Ac3Descriptor::getMainid(void) const
-{
-       return mainid;
-}
-
-uint8_t Ac3Descriptor::getAvsc(void) const
-{
-       return avsc;
-}
-
-const AdditionalInfoVector *Ac3Descriptor::getAdditionalInfo(void) const
-{
-       return &additionalInfo;
-}
-
diff --git a/lib/dvb_si/ac3_descriptor.h b/lib/dvb_si/ac3_descriptor.h
deleted file mode 100644 (file)
index d5eaf83..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $Id: ac3_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ac3_descriptor_h__
-#define __dvb_descriptor_ac3_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> AdditionalInfoVector;
-typedef AdditionalInfoVector::iterator AdditionalInfoIterator;
-typedef AdditionalInfoVector::const_iterator AdditionalInfoConstIterator;
-
-class Ac3Descriptor : public Descriptor
-{
-       protected:
-               unsigned ac3TypeFlag                            : 1;
-               unsigned bsidFlag                               : 1;
-               unsigned mainidFlag                             : 1;
-               unsigned asvcFlag                               : 1;
-               unsigned reserved                               : 4;
-               unsigned ac3Type                                : 8;
-               unsigned bsid                                   : 8;
-               unsigned mainid                                 : 8;
-               unsigned avsc                                   : 8;
-               AdditionalInfoVector additionalInfo;
-
-       public:
-               Ac3Descriptor(const uint8_t * const buffer);
-
-               uint8_t getAc3TypeFlag(void) const;
-               uint8_t getBsidFlag(void) const;
-               uint8_t getMainidFlag(void) const;
-               uint8_t getAsvcFlag(void) const;
-               uint8_t getAc3Type(void) const;
-               uint8_t getBsid(void) const;
-               uint8_t getMainid(void) const;
-               uint8_t getAvsc(void) const;
-               const AdditionalInfoVector *getAdditionalInfo(void) const;
-};
-
-#endif /* __dvb_descriptor_ac3_descriptor_h__ */
diff --git a/lib/dvb_si/ait.cpp b/lib/dvb_si/ait.cpp
deleted file mode 100644 (file)
index 74e38ca..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * $Id: ait.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/ait.h>
-
-ApplicationIdentifier::ApplicationIdentifier(const uint8_t * const buffer)
-{
-       organisationId = (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
-       applicationId = (buffer[4] << 8) | buffer[5];
-}
-
-uint32_t ApplicationIdentifier::getOrganisationId(void) const
-{
-       return organisationId;
-}
-
-uint16_t ApplicationIdentifier::getApplicationId(void) const
-{
-       return applicationId;
-}
-
-ApplicationInformation::ApplicationInformation(const uint8_t * const buffer)
-{
-       applicationIdentifier = new ApplicationIdentifier(&buffer[0]);
-       applicationControlCode = buffer[6];
-       reserved = (buffer[7] >> 4) & 0x0f;
-       applicationDescriptorsLoopLength = ((buffer[7] & 0x0f) << 8) | buffer[8];
-
-       for (uint16_t i = 0; i < applicationDescriptorsLoopLength; i += buffer[i + 10] + 2)
-               descriptor(&buffer[i + 9]);
-}
-
-ApplicationInformation::~ApplicationInformation(void)
-{
-       delete applicationIdentifier;
-}
-
-const ApplicationIdentifier *ApplicationInformation::getApplicationIdentifier(void) const
-{
-       return applicationIdentifier;
-}
-
-uint8_t ApplicationInformation::getApplicationControlCode(void) const
-{
-       return applicationControlCode;
-}
-
-ApplicationInformationTable::ApplicationInformationTable(const uint8_t * const buffer) : LongCrcTable(buffer)
-{
-       reserved4 = (buffer[8] >> 4) & 0x0f;
-       commonDescriptorsLength = ((buffer[8] & 0x0f) << 8) | buffer[9];
-
-       for (uint16_t i = 0; i < commonDescriptorsLength; i += buffer[i + 11] + 2)
-               descriptor(&buffer[i + 10]);
-
-       reserved5 = (buffer[commonDescriptorsLength + 10] >> 4) & 0x0f;
-       applicationLoopLength = ((buffer[commonDescriptorsLength + 10] & 0x0f) << 8) | buffer[commonDescriptorsLength + 11];
-
-       for (uint16_t i = 0; i < applicationLoopLength; i += 9) {
-               ApplicationInformation *a = new ApplicationInformation(&buffer[commonDescriptorsLength + 12]);
-               applicationInformation.push_back(a);
-               i += a->applicationDescriptorsLoopLength;
-       }
-}
-
-ApplicationInformationTable::~ApplicationInformationTable(void)
-{
-       for (ApplicationInformationIterator i = applicationInformation.begin(); i != applicationInformation.end(); ++i)
-               delete *i;
-}
-
-const ApplicationInformationVector *ApplicationInformationTable::getApplicationInformation(void) const
-{
-       return &applicationInformation;
-}
-
diff --git a/lib/dvb_si/ait.h b/lib/dvb_si/ait.h
deleted file mode 100644 (file)
index 8dd71f6..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * $Id: ait.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_ait_h__
-#define __dvb_table_ait_h__
-
-#include <lib/dvb_si/container.h>
-#include "long_crc_table.h"
-
-class ApplicationIdentifier
-{
-       protected:
-               unsigned organisationId                         : 32;
-               unsigned applicationId                          : 16;
-
-       public:
-               ApplicationIdentifier(const uint8_t * const buffer);
-
-               uint32_t getOrganisationId(void) const;
-               uint16_t getApplicationId(void) const;
-};
-
-class ApplicationInformation : public DescriptorContainer
-{
-       protected:
-               ApplicationIdentifier *applicationIdentifier;
-               unsigned applicationControlCode                 : 8;
-               unsigned reserved                               : 4;
-               unsigned applicationDescriptorsLoopLength       : 12;
-
-       public:
-               ApplicationInformation(const uint8_t * const buffer);
-               ~ApplicationInformation(void);
-
-               const ApplicationIdentifier *getApplicationIdentifier(void) const;
-               uint8_t getApplicationControlCode(void) const;
-
-       friend class ApplicationInformationTable;
-};
-
-typedef std::vector<ApplicationInformation *> ApplicationInformationVector;
-typedef ApplicationInformationVector::iterator ApplicationInformationIterator;
-typedef ApplicationInformationVector::const_iterator ApplicationInformationConstIterator;
-
-class ApplicationInformationTable : public LongCrcTable, public DescriptorContainer
-{
-       protected:
-               unsigned reserved4                              : 4;
-               unsigned commonDescriptorsLength                : 12;
-               unsigned reserved5                              : 4;
-               unsigned applicationLoopLength                  : 12;
-               ApplicationInformationVector applicationInformation;
-
-       public:
-               ApplicationInformationTable(const uint8_t * const buffer);
-               ~ApplicationInformationTable(void);
-
-               static const enum TableId TID = TID_AIT;
-               static const uint32_t TIMEOUT = 12000;
-
-               const ApplicationInformationVector *getApplicationInformation(void) const;
-};
-
-typedef std::vector<ApplicationInformationTable *> ApplicationInformationTableVector;
-typedef ApplicationInformationTableVector::iterator ApplicationInformationTableIterator;
-typedef ApplicationInformationTableVector::const_iterator ApplicationInformationTableConstIterator;
-
-#endif /* __dvb_table_ait_h__ */
diff --git a/lib/dvb_si/ancillary_data_descriptor.cpp b/lib/dvb_si/ancillary_data_descriptor.cpp
deleted file mode 100644 (file)
index 33cb85c..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * $Id: ancillary_data_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/ancillary_data_descriptor.h>
-
-AncillaryDataDescriptor::AncillaryDataDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       ancillaryDataIdentifier = buffer[2];
-}
-
-uint8_t AncillaryDataDescriptor::getAncillaryDataIdentifier(void) const
-{
-       return ancillaryDataIdentifier;
-}
-
diff --git a/lib/dvb_si/ancillary_data_descriptor.h b/lib/dvb_si/ancillary_data_descriptor.h
deleted file mode 100644 (file)
index f6ddd11..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $Id: ancillary_data_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ancillary_data_descriptor_h__
-#define __dvb_descriptor_ancillary_data_descriptor_h__
-
-#include "descriptor.h"
-
-class AncillaryDataDescriptor : public Descriptor
-{
-       protected:
-               unsigned ancillaryDataIdentifier                : 8;
-
-       public:
-               AncillaryDataDescriptor(const uint8_t * const buffer);
-
-               uint8_t getAncillaryDataIdentifier(void) const;
-};
-
-#endif /* __dvb_descriptor_ancillary_data_descriptor_h__ */
diff --git a/lib/dvb_si/announcement_support_descriptor.cpp b/lib/dvb_si/announcement_support_descriptor.cpp
deleted file mode 100644 (file)
index 5cc13f7..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * $Id: announcement_support_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/announcement_support_descriptor.h>
-
-Announcement::Announcement(const uint8_t * const buffer)
-{
-       announcementType = (buffer[0] >> 4) & 0x0f;
-       reserved = (buffer[0] >> 3) & 0x01;
-       referenceType = buffer[0] & 0x07;
-
-       if ((referenceType >= 0x01) && (referenceType <= 0x03)) {
-               originalNetworkId = (buffer[1] << 8) | buffer[2];
-               transportStreamId = (buffer[3] << 8) | buffer[4];
-               serviceId = (buffer[5] << 8) | buffer[6];
-               componentTag = buffer[7];
-       }
-}
-
-uint8_t Announcement::getAnnouncementType(void) const
-{
-       return announcementType;
-}
-
-uint8_t Announcement::getReferenceType(void) const
-{
-       return referenceType;
-}
-
-uint16_t Announcement::getOriginalNetworkId(void) const
-{
-       return originalNetworkId;
-}
-
-uint16_t Announcement::getTransportStreamId(void) const
-{
-       return transportStreamId;
-}
-
-uint16_t Announcement::getServiceId(void) const
-{
-       return serviceId;
-}
-
-uint8_t Announcement::getComponentTag(void) const
-{
-       return componentTag;
-}
-
-AnnouncementSupportDescriptor::AnnouncementSupportDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       Announcement *a;
-
-       announcementSupportIndicator = (buffer[2] << 8) | buffer[3];
-       
-       if (descriptorLength < 2)
-               return;
-
-       for (uint16_t i = 0; i < descriptorLength - 2; ++i) {
-               a = new Announcement(&buffer[i + 4]);
-               announcements.push_back(a);
-               switch (a->getReferenceType()) {
-               case 0x01:
-               case 0x02:
-               case 0x03:
-                       i += 7;
-                       break;
-               default:
-                       break;
-               }
-       }
-}
-
-AnnouncementSupportDescriptor::~AnnouncementSupportDescriptor(void)
-{
-       for (AnnouncementIterator i = announcements.begin(); i != announcements.end(); ++i)
-               delete *i;
-}
-
-uint16_t AnnouncementSupportDescriptor::getAnnouncementSupportIndicator(void) const
-{
-       return announcementSupportIndicator;
-}
-
-const AnnouncementVector *AnnouncementSupportDescriptor::getAnnouncements(void) const
-{
-       return &announcements;
-}
-
diff --git a/lib/dvb_si/announcement_support_descriptor.h b/lib/dvb_si/announcement_support_descriptor.h
deleted file mode 100644 (file)
index ce80cbe..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * $Id: announcement_support_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_announcement_support_descriptor_h__
-#define __dvb_descriptor_announcement_support_descriptor_h__
-
-#include "descriptor.h"
-
-class Announcement
-{
-       protected:
-               unsigned announcementType                       : 4;
-               unsigned reserved                               : 1;
-               unsigned referenceType                          : 3;
-               unsigned originalNetworkId                      : 16;
-               unsigned transportStreamId                      : 16;
-               unsigned serviceId                              : 16;
-               unsigned componentTag                           : 8;
-
-       public:
-               Announcement(const uint8_t * const buffer);
-
-               uint8_t getAnnouncementType(void) const;
-               uint8_t getReferenceType(void) const;
-               uint16_t getOriginalNetworkId(void) const;
-               uint16_t getTransportStreamId(void) const;
-               uint16_t getServiceId(void) const;
-               uint8_t getComponentTag(void) const;
-};
-
-typedef std::vector<Announcement *> AnnouncementVector;
-typedef AnnouncementVector::iterator AnnouncementIterator;
-typedef AnnouncementVector::const_iterator AnnouncementConstIterator;
-
-class AnnouncementSupportDescriptor : public Descriptor
-{
-       protected:
-               unsigned announcementSupportIndicator           : 16;
-               AnnouncementVector announcements;
-
-       public:
-               AnnouncementSupportDescriptor(const uint8_t * const buffer);
-               ~AnnouncementSupportDescriptor(void);
-
-               uint16_t getAnnouncementSupportIndicator(void) const;
-               const AnnouncementVector *getAnnouncements(void) const;
-};
-
-#endif /* __dvb_descriptor_announcement_support_descriptor_h__ */
diff --git a/lib/dvb_si/application_signalling_descriptor.cpp b/lib/dvb_si/application_signalling_descriptor.cpp
deleted file mode 100644 (file)
index 978780f..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id: application_signalling_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/application_signalling_descriptor.h>
-
-ApplicationSignalling::ApplicationSignalling(const uint8_t * const buffer)
-{
-       applicationType = (buffer[0] << 8) | buffer[1];
-       reserved = (buffer[2] >> 5) & 0x07;
-       aitVersionNumber = buffer[2] & 0x1f;
-}
-
-uint16_t ApplicationSignalling::getApplicationType(void) const
-{
-       return applicationType;
-}
-
-uint8_t ApplicationSignalling::getAitVersionNumber(void) const
-{
-       return aitVersionNumber;
-}
-
-ApplicationSignallingDescriptor::ApplicationSignallingDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += 3)
-               applicationSignallings.push_back(new ApplicationSignalling(&buffer[i + 2]));
-}
-
-ApplicationSignallingDescriptor::~ApplicationSignallingDescriptor(void)
-{
-       for (ApplicationSignallingIterator i = applicationSignallings.begin(); i != applicationSignallings.end(); ++i)
-               delete *i;
-}
-
-const ApplicationSignallingVector *ApplicationSignallingDescriptor::getApplicationSignallings(void) const
-{
-       return &applicationSignallings;
-}
-
diff --git a/lib/dvb_si/application_signalling_descriptor.h b/lib/dvb_si/application_signalling_descriptor.h
deleted file mode 100644 (file)
index c4533e1..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id: application_signalling_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_application_signalling_descriptor_h__
-#define __dvb_descriptor_application_signalling_descriptor_h__
-
-#include "descriptor.h"
-
-class ApplicationSignalling
-{
-       protected:
-               unsigned applicationType                        : 16;
-               unsigned reserved                               : 3;
-               unsigned aitVersionNumber                       : 5;
-
-       public:
-               ApplicationSignalling(const uint8_t * const buffer);
-
-               uint16_t getApplicationType(void) const;
-               uint8_t getAitVersionNumber(void) const;
-};
-
-typedef std::vector<ApplicationSignalling *> ApplicationSignallingVector;
-typedef ApplicationSignallingVector::iterator ApplicationSignallingIterator;
-typedef ApplicationSignallingVector::const_iterator ApplicationSignallingConstIterator;
-
-class ApplicationSignallingDescriptor : public Descriptor
-{
-       protected:
-               ApplicationSignallingVector applicationSignallings;
-
-       public:
-               ApplicationSignallingDescriptor(const uint8_t * const buffer);
-               ~ApplicationSignallingDescriptor(void);
-
-               const ApplicationSignallingVector *getApplicationSignallings(void) const;
-};
-
-#endif /* __dvb_descriptor_application_signalling_descriptor_h__ */
diff --git a/lib/dvb_si/audio_stream_descriptor.cpp b/lib/dvb_si/audio_stream_descriptor.cpp
deleted file mode 100644 (file)
index 6a27af1..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * $Id: audio_stream_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/audio_stream_descriptor.h>
-
-AudioStreamDescriptor::AudioStreamDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       freeFormatFlag = (buffer[2] >> 7) & 0x01;
-       id = (buffer[2] >> 6) & 0x01;
-       layer = (buffer[2] >> 4) & 0x03;
-       variableRateAudioIndicator = (buffer[2] >> 3) & 0x01;
-       reserved = buffer[2] & 0x07;
-}
-
-uint8_t AudioStreamDescriptor::getFreeFormatFlag(void) const
-{
-       return freeFormatFlag;
-}
-
-uint8_t AudioStreamDescriptor::getId(void) const
-{
-       return id;
-}
-
-uint8_t AudioStreamDescriptor::getLayer(void) const
-{
-       return layer;
-}
-
-uint8_t AudioStreamDescriptor::getVariableRateAudioIndicator(void) const
-{
-       return variableRateAudioIndicator;
-}
-
diff --git a/lib/dvb_si/audio_stream_descriptor.h b/lib/dvb_si/audio_stream_descriptor.h
deleted file mode 100644 (file)
index 17876b7..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * $Id: audio_stream_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_audio_stream_descriptor_h__
-#define __dvb_descriptor_audio_stream_descriptor_h__
-
-#include "descriptor.h"
-
-class AudioStreamDescriptor : public Descriptor
-{
-       protected:
-               unsigned freeFormatFlag                         : 1;
-               unsigned id                                     : 1;
-               unsigned layer                                  : 2;
-               unsigned variableRateAudioIndicator             : 1;
-               unsigned reserved                               : 3;
-
-       public:
-               AudioStreamDescriptor(const uint8_t * const buffer);
-
-               uint8_t getFreeFormatFlag(void) const;
-               uint8_t getId(void) const;
-               uint8_t getLayer(void) const;
-               uint8_t getVariableRateAudioIndicator(void) const;
-};
-
-#endif /* __dvb_descriptor_audio_stream_descriptor_h__ */
diff --git a/lib/dvb_si/bat.cpp b/lib/dvb_si/bat.cpp
deleted file mode 100644 (file)
index a3763f7..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * $Id: bat.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/bat.h>
-
-BouquetAssociation::BouquetAssociation(const uint8_t * const buffer)
-{
-       transportStreamId = (buffer[0] << 8) | buffer[1];
-       originalNetworkId = (buffer[2] << 8) | buffer[3];
-       reserved = (buffer[4] >> 4) & 0x0f;
-       transportStreamLoopLength = ((buffer[4] & 0x0f) << 8) | buffer[5];
-
-       for (uint16_t i = 6; i < transportStreamLoopLength + 6; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-}
-
-BouquetAssociationTable::BouquetAssociationTable(const uint8_t * const buffer) : LongCrcTable(buffer)
-{
-       reserved4 = (buffer[8] >> 4) & 0x0f;
-       bouquetDescriptorsLength = ((buffer[8] & 0x0f) << 8) | buffer[9];
-
-       for (uint16_t i = 10; i < bouquetDescriptorsLength + 10; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-
-       reserved5 = (buffer[bouquetDescriptorsLength + 10] >> 4) & 0x0f;
-       transportStreamLoopLength = ((buffer[bouquetDescriptorsLength + 10] & 0x0f) << 8) | buffer[bouquetDescriptorsLength + 11];
-
-       for (uint16_t i = bouquetDescriptorsLength + 12; i < sectionLength - 1; i += ((buffer[i + 4] & 0x0f) | buffer[i + 5]) + 6)
-               bouquet.push_back(new BouquetAssociation(&buffer[i]));
-}
-
-BouquetAssociationTable::~BouquetAssociationTable(void)
-{
-       for (BouquetAssociationIterator b = bouquet.begin(); b != bouquet.end(); ++b)
-               delete *b;
-}
-
diff --git a/lib/dvb_si/bat.h b/lib/dvb_si/bat.h
deleted file mode 100644 (file)
index 41fd97f..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * $Id: bat.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_bat_h__
-#define __dvb_table_bat_h__
-
-#include <lib/dvb_si/container.h>
-#include "long_crc_table.h"
-
-class BouquetAssociation : public DescriptorContainer
-{
-       protected:
-               unsigned transportStreamId                      : 16;
-               unsigned originalNetworkId                      : 16;
-               unsigned reserved                               : 4;
-               unsigned transportStreamLoopLength              : 12;
-
-       public:
-               BouquetAssociation(const uint8_t * const buffer);
-};
-
-typedef std::vector<BouquetAssociation *> BouquetAssociationVector;
-typedef BouquetAssociationVector::iterator BouquetAssociationIterator;
-typedef BouquetAssociationVector::const_iterator BouquetAssociationConstIterator;
-
-class BouquetAssociationTable : public LongCrcTable , public DescriptorContainer
-{
-       protected:
-               unsigned reserved4                              : 4;
-               unsigned bouquetDescriptorsLength               : 12;
-               unsigned reserved5                              : 4;
-               unsigned transportStreamLoopLength              : 12;
-               BouquetAssociationVector bouquet;
-
-       public:
-               BouquetAssociationTable(const uint8_t * const buffer);
-               ~BouquetAssociationTable(void);
-
-               static const enum PacketId PID = PID_BAT;
-               static const enum TableId TID = TID_BAT;
-               static const uint32_t TIMEOUT = 12000;
-};
-
-typedef std::vector<BouquetAssociationTable *> BouquetAssociationTableVector;
-typedef BouquetAssociationTableVector::iterator BouquetAssociationTableIterator;
-typedef BouquetAssociationTableVector::const_iterator BouquetAssociationTableConstIterator;
-
-#endif /* __dvb_table_bat_h__ */
diff --git a/lib/dvb_si/bouquet_name_descriptor.cpp b/lib/dvb_si/bouquet_name_descriptor.cpp
deleted file mode 100644 (file)
index e11a208..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * $Id: bouquet_name_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/bouquet_name_descriptor.h>
-
-BouquetNameDescriptor::BouquetNameDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       bouquetName.assign((char *)&buffer[2], descriptorLength);
-}
-
-std::string BouquetNameDescriptor::getBouquetName(void) const
-{
-       return bouquetName;
-}
-
diff --git a/lib/dvb_si/bouquet_name_descriptor.h b/lib/dvb_si/bouquet_name_descriptor.h
deleted file mode 100644 (file)
index 5f608bc..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $Id: bouquet_name_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_bouquet_name_descriptor_h__
-#define __dvb_descriptor_bouquet_name_descriptor_h__
-
-#include "descriptor.h"
-
-class BouquetNameDescriptor : public Descriptor
-{
-       protected:
-               std::string bouquetName;
-
-       public:
-               BouquetNameDescriptor(const uint8_t * const buffer);
-               ~BouquetNameDescriptor(void);
-
-               std::string getBouquetName(void) const;
-};
-
-#endif /* __dvb_descriptor_bouquet_name_descriptor_h__ */
diff --git a/lib/dvb_si/ca_descriptor.cpp b/lib/dvb_si/ca_descriptor.cpp
deleted file mode 100644 (file)
index 019855d..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * $Id: ca_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/ca_descriptor.h>
-
-CaDescriptor::CaDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       caSystemId = (buffer[2] << 8) | buffer[3];
-       reserved = buffer[4] >> 5;
-       caPid = ((buffer[4] & 0x1F) << 8) | buffer[5];
-
-       if (descriptorLength < 4)
-               return;
-       for (uint16_t i = 0; i < descriptorLength - 4; ++i)
-               privateDataBytes.push_back(buffer[i + 6]);
-}
-
-uint16_t CaDescriptor::getCaSystemId(void) const
-{
-       return caSystemId;
-}
-
-uint16_t CaDescriptor::getCaPid(void) const
-{
-       return caPid;
-}
-
-const PrivateDataByteVector *CaDescriptor::getPrivateDataBytes(void) const
-{
-       return &privateDataBytes;
-}
-
diff --git a/lib/dvb_si/ca_descriptor.h b/lib/dvb_si/ca_descriptor.h
deleted file mode 100644 (file)
index b02add9..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * $Id: ca_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ca_descriptor_h__
-#define __dvb_descriptor_ca_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> PrivateDataByteVector;
-typedef PrivateDataByteVector::iterator PrivateDataByteIterator;
-typedef PrivateDataByteVector::const_iterator PrivateDataByteConstIterator;
-
-class CaDescriptor : public Descriptor
-{
-       protected:
-               unsigned caSystemId                             : 16;
-               unsigned reserved                               : 3;
-               unsigned caPid                                  : 13;
-               PrivateDataByteVector privateDataBytes;
-
-       public:
-               CaDescriptor(const uint8_t * const buffer);
-
-               uint16_t getCaSystemId(void) const;
-               uint16_t getCaPid(void) const;
-               const PrivateDataByteVector *getPrivateDataBytes(void) const;
-};
-
-typedef std::vector<CaDescriptor *> CaDescriptorVector;
-typedef CaDescriptorVector::iterator CaDescriptorIterator;
-typedef CaDescriptorVector::const_iterator CaDescriptorConstIterator;
-
-#endif /* __dvb_descriptor_ca_descriptor_h__ */
diff --git a/lib/dvb_si/ca_identifier_descriptor.cpp b/lib/dvb_si/ca_identifier_descriptor.cpp
deleted file mode 100644 (file)
index 5804c5d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * $Id: ca_identifier_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/ca_identifier_descriptor.h>
-
-CaIdentifierDescriptor::CaIdentifierDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += 2)
-               caSystemIds.push_back((buffer[i + 2] << 8) | buffer[i + 3]);
-}
-
-const CaSystemIdVector *CaIdentifierDescriptor::getCaSystemIds(void) const
-{
-       return &caSystemIds;
-}
-
diff --git a/lib/dvb_si/ca_identifier_descriptor.h b/lib/dvb_si/ca_identifier_descriptor.h
deleted file mode 100644 (file)
index 432d8d5..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $Id: ca_identifier_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ca_identifier_descriptor_h__
-#define __dvb_descriptor_ca_identifier_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint16_t> CaSystemIdVector;
-typedef CaSystemIdVector::iterator CaSystemIdIterator;
-typedef CaSystemIdVector::const_iterator CaSystemIdConstIterator;
-
-class CaIdentifierDescriptor : public Descriptor
-{
-       protected:
-               CaSystemIdVector caSystemIds;
-
-       public:
-               CaIdentifierDescriptor(const uint8_t * const buffer);
-
-               const CaSystemIdVector *getCaSystemIds(void) const;
-};
-
-#endif /* __dvb_descriptor_ca_identifier_descriptor_h__ */
diff --git a/lib/dvb_si/ca_system_descriptor.cpp b/lib/dvb_si/ca_system_descriptor.cpp
deleted file mode 100644 (file)
index acae51f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * $Id: ca_system_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/ca_system_descriptor.h>
-
-CaSystemDescriptor::CaSystemDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       scramblingCode = buffer[2];
-}
-
-uint8_t CaSystemDescriptor::getScramblingCode(void) const
-{
-       return scramblingCode;
-}
-
diff --git a/lib/dvb_si/ca_system_descriptor.h b/lib/dvb_si/ca_system_descriptor.h
deleted file mode 100644 (file)
index 0149197..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $Id: ca_system_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ca_system_descriptor_h__
-#define __dvb_descriptor_ca_system_descriptor_h__
-
-#include "descriptor.h"
-
-class CaSystemDescriptor : public Descriptor
-{
-       protected:
-               unsigned scramblingCode                         : 8;
-
-       public:
-               CaSystemDescriptor(const uint8_t * const buffer);
-
-               uint8_t getScramblingCode(void) const;
-};
-
-#endif /* __dvb_descriptor_ca_system_descriptor_h__ */
diff --git a/lib/dvb_si/cable_delivery_system_descriptor.cpp b/lib/dvb_si/cable_delivery_system_descriptor.cpp
deleted file mode 100644 (file)
index 4d07080..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * $Id: cable_delivery_system_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/cable_delivery_system_descriptor.h>
-
-CableDeliverySystemDescriptor::CableDeliverySystemDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       frequency =
-       (
-               ((buffer[2] >> 4)       * 10000000) +
-               ((buffer[2] & 0x0F)     * 1000000) +
-               ((buffer[3] >> 4)       * 100000) +
-               ((buffer[3] & 0x0F)     * 10000) +
-               ((buffer[4] >> 4)       * 1000) +
-               ((buffer[4] & 0x0F)     * 100) +
-               ((buffer[5] >> 4)       * 10) +
-               ((buffer[5] & 0x0F)     * 1)
-       );
-
-       reserved = (buffer[6] << 4) | ((buffer[7] >> 4) & 0x0F);
-       fecOuter = buffer[7] & 0x0F;
-       modulation = buffer[8];
-
-       symbolRate =
-       (
-               ((buffer[9] >> 4)       * 1000000) +
-               ((buffer[9] & 0x0F)     * 100000) +
-               ((buffer[10] >> 4)      * 10000) +
-               ((buffer[10] & 0x0F)    * 1000) +
-               ((buffer[11] >> 4)      * 100) +
-               ((buffer[11] & 0x0F)    * 10) +
-               ((buffer[12] >> 4)      * 1)
-       );
-
-       fecInner = buffer[12] & 0x0F;
-}
-
-uint32_t CableDeliverySystemDescriptor::getFrequency(void) const
-{
-       return frequency;
-}
-
-uint8_t CableDeliverySystemDescriptor::getFecOuter(void) const
-{
-       return fecOuter;
-}
-
-uint8_t CableDeliverySystemDescriptor::getModulation(void) const
-{
-       return modulation;
-}
-
-uint32_t CableDeliverySystemDescriptor::getSymbolRate(void) const
-{
-       return symbolRate;
-}
-
-uint8_t CableDeliverySystemDescriptor::getFecInner(void) const
-{
-       return fecInner;
-}
-
diff --git a/lib/dvb_si/cable_delivery_system_descriptor.h b/lib/dvb_si/cable_delivery_system_descriptor.h
deleted file mode 100644 (file)
index c063222..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $Id: cable_delivery_system_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_cable_delivery_system_descriptor_h__
-#define __dvb_descriptor_cable_delivery_system_descriptor_h__
-
-#include "descriptor.h"
-
-class CableDeliverySystemDescriptor : public Descriptor
-{
-       protected:
-               unsigned frequency                              : 32;
-               unsigned reserved                               : 12;
-               unsigned fecOuter                               : 4;
-               unsigned modulation                             : 8;
-               unsigned symbolRate                             : 28;
-               unsigned fecInner                               : 4;
-
-       public:
-               CableDeliverySystemDescriptor(const uint8_t * const buffer);
-
-               uint32_t getFrequency(void) const;
-               uint8_t getFecOuter(void) const;
-               uint8_t getModulation(void) const;
-               uint32_t getSymbolRate(void) const;
-               uint8_t getFecInner(void) const;
-};
-
-#endif /* __dvb_descriptor_cable_delivery_system_descriptor_h__ */
diff --git a/lib/dvb_si/camt.cpp b/lib/dvb_si/camt.cpp
deleted file mode 100644 (file)
index 7383a21..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * $Id: camt.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/camt.h>
-
-ConditionalAccessMessageTable::ConditionalAccessMessageTable(const uint8_t * const buffer) : ShortTable(buffer)
-{
-       for (uint16_t i = 8; i < sectionLength - 1; ++i)
-               caDataByte.push_back(buffer[i]);
-}
-
diff --git a/lib/dvb_si/camt.h b/lib/dvb_si/camt.h
deleted file mode 100644 (file)
index e01b806..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * $Id: camt.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_camt_h__
-#define __dvb_table_camt_h__
-
-#include "short_table.h"
-
-class ConditionalAccessMessageTable : public ShortTable
-{
-       protected:
-               std::vector<uint8_t> caDataByte;
-
-       public:
-               ConditionalAccessMessageTable(const uint8_t * const buffer);
-
-               static const uint16_t LENGTH = 256;
-               static const enum TableId TID = TID_CAMT_ECM_0;
-};
-
-typedef std::vector<ConditionalAccessMessageTable *> ConditionalAccessMessageTableVector;
-typedef ConditionalAccessMessageTableVector::iterator ConditionalAccessMessageTableIterator;
-typedef ConditionalAccessMessageTableVector::const_iterator ConditionalAccessMessageTableConstIterator;
-
-#endif /* __dvb_table_camt_h__ */
diff --git a/lib/dvb_si/capmt.cpp b/lib/dvb_si/capmt.cpp
deleted file mode 100644 (file)
index c5a6ab9..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * $Id: capmt.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/descriptor_tag.h>
-#include <lib/dvb_si/capmt.h>
-
-CaLengthField::CaLengthField(const uint64_t length)
-{
-       if (length < 0x80) {
-               sizeIndicator = 0;
-               lengthValue = length;
-       }
-
-       else {
-               uint64_t mask = 0xFF;
-
-               sizeIndicator = 1;
-               lengthFieldSize = 1;
-
-               while ((length & mask) != length) {
-                       lengthFieldSize++;
-                       mask = ((uint64_t)(mask << 8)) | ((uint64_t)0xFFULL);
-               }
-
-               for (uint8_t i = lengthFieldSize; i > 0; i--)
-                       lengthValueByte.push_back((length >> ((i - 1) << 3)) & 0xFF);
-       }
-}
-
-CaElementaryStreamInfo::CaElementaryStreamInfo(const ElementaryStreamInfo * const info, const uint8_t cmdId)
-{
-       streamType = info->streamType;
-       reserved1 = info->reserved1;
-       elementaryPid = info->elementaryPid;
-       reserved2 = info->reserved2;
-       esInfoLength = 0;
-
-       for (DescriptorConstIterator i = info->getDescriptors()->begin(); i != info->getDescriptors()->end(); ++i)
-               if ((*i)->getTag() == CA_DESCRIPTOR) {
-                       descriptors.push_back(new CaDescriptor(*(CaDescriptor *)*i));
-                       esInfoLength += (*i)->getLength() + 2;
-               }
-
-       if (esInfoLength) {
-               caPmtCmdId = cmdId;
-               esInfoLength++;
-       }
-}
-
-CaElementaryStreamInfo::~CaElementaryStreamInfo(void)
-{
-       for (CaDescriptorIterator i = descriptors.begin(); i != descriptors.end(); ++i)
-               delete *i;
-}
-
-uint16_t CaElementaryStreamInfo::getLength(void) const
-{
-       return esInfoLength + 5;
-}
-
-CaProgramMapTable::CaProgramMapTable(const ProgramMapTable * const pmt, const uint8_t listManagement, const uint8_t cmdId)
-{
-       uint64_t length = 6;
-
-       caPmtTag = 0x9F80C3;
-       caPmtListManagement = listManagement;
-
-       programNumber = pmt->tableIdExtension;
-       reserved1 = pmt->reserved3;
-       versionNumber = pmt->versionNumber;
-       currentNextIndicator = pmt->currentNextIndicator;
-       reserved2 = pmt->reserved5;
-       programInfoLength = 0;
-
-       for (DescriptorConstIterator i = pmt->getDescriptors()->begin(); i != pmt->getDescriptors()->end(); ++i)
-               if ((*i)->getTag() == CA_DESCRIPTOR) {
-                       descriptors.push_back(new CaDescriptor(*(CaDescriptor *)*i));
-                       programInfoLength += (*i)->getLength() + 2;
-               }
-
-       if (programInfoLength) {
-               caPmtCmdId = cmdId;
-               programInfoLength++;
-               length += programInfoLength;
-       }
-
-       for (ElementaryStreamInfoConstIterator i = pmt->esInfo.begin(); i != pmt->esInfo.end(); ++i) {
-               CaElementaryStreamInfo *info = new CaElementaryStreamInfo(*i, cmdId);
-               esInfo.push_back(info);
-               length += info->getLength();
-       }
-
-       lengthField = new CaLengthField(length);
-}
-
-CaProgramMapTable::~CaProgramMapTable(void)
-{
-       for (CaDescriptorIterator i = descriptors.begin(); i != descriptors.end(); ++i)
-               delete *i;
-
-       for (CaElementaryStreamInfoIterator i = esInfo.begin(); i != esInfo.end(); ++i)
-               delete *i;
-
-       delete lengthField;
-}
-
diff --git a/lib/dvb_si/capmt.h b/lib/dvb_si/capmt.h
deleted file mode 100644 (file)
index 6d8dc43..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * $Id: capmt.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_capmt_h__
-#define __dvb_table_capmt_h__
-
-#include <lib/dvb_si/ca_descriptor.h>
-#include "pmt.h"
-
-class CaLengthField
-{
-       protected:
-               unsigned sizeIndicator                          : 1;
-               unsigned lengthValue                            : 7;
-               unsigned lengthFieldSize                        : 7;
-               std::vector<uint8_t> lengthValueByte;
-
-       public:
-               CaLengthField(const uint64_t length);
-};
-
-class CaElementaryStreamInfo
-{
-       protected:
-               unsigned streamType                             : 8;
-               unsigned reserved1                              : 3;
-               unsigned elementaryPid                          : 13;
-               unsigned reserved2                              : 4;
-               unsigned esInfoLength                           : 12;
-               unsigned caPmtCmdId                             : 8;
-               CaDescriptorVector descriptors;
-
-       public:
-               CaElementaryStreamInfo(const ElementaryStreamInfo * const info, const uint8_t cmdId);
-               ~CaElementaryStreamInfo(void);
-
-               uint16_t getLength(void) const;
-};
-
-typedef std::vector<CaElementaryStreamInfo *> CaElementaryStreamInfoVector;
-typedef CaElementaryStreamInfoVector::iterator CaElementaryStreamInfoIterator;
-typedef CaElementaryStreamInfoVector::const_iterator CaElementaryStreamInfoConstIterator;
-
-class CaProgramMapTable
-{
-       protected:
-               unsigned caPmtTag                               : 24;
-               CaLengthField *lengthField;
-               unsigned caPmtListManagement                    : 8;
-               unsigned programNumber                          : 16;
-               unsigned reserved1                              : 2;
-               unsigned versionNumber                          : 5;
-               unsigned currentNextIndicator                   : 1;
-               unsigned reserved2                              : 4;
-               unsigned programInfoLength                      : 12;
-               unsigned caPmtCmdId                             : 8;
-               CaDescriptorVector descriptors;
-               CaElementaryStreamInfoVector esInfo;
-
-       public:
-               CaProgramMapTable(const ProgramMapTable * const pmt, const uint8_t listManagement, const uint8_t cmdId);
-               ~CaProgramMapTable(void);
-};
-
-typedef std::vector<CaProgramMapTable *> CaProgramMapTableVector;
-typedef CaProgramMapTableVector::iterator CaProgramMapTableIterator;
-typedef CaProgramMapTableVector::const_iterator CaProgramMapTableConstIterator;
-
-#endif /* __dvb_table_capmt_h__ */
diff --git a/lib/dvb_si/cat.cpp b/lib/dvb_si/cat.cpp
deleted file mode 100644 (file)
index de69230..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * $Id: cat.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/cat.h>
-
-ConditionalAccessTable::ConditionalAccessTable(const uint8_t * const buffer) : LongCrcTable(buffer)
-{
-       for (uint16_t i = 8; i < sectionLength - 1; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-}
-
diff --git a/lib/dvb_si/cat.h b/lib/dvb_si/cat.h
deleted file mode 100644 (file)
index 3c3e3cd..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $Id: cat.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_cat_h__
-#define __dvb_table_cat_h__
-
-#include <lib/dvb_si/container.h>
-#include "long_crc_table.h"
-
-class ConditionalAccessTable : public LongCrcTable, public DescriptorContainer
-{
-       public:
-               ConditionalAccessTable(const uint8_t * const buffer);
-
-               static const enum PacketId PID = PID_CAT;
-               static const enum TableId TID = TID_CAT;
-               static const uint32_t TIMEOUT = 200;
-};
-
-typedef std::vector<ConditionalAccessTable *> ConditionalAccessTableVector;
-typedef ConditionalAccessTableVector::iterator ConditionalAccessTableIterator;
-typedef ConditionalAccessTableVector::const_iterator ConditionalAccessTableConstIterator;
-
-#endif /* __dvb_table_cat_h__ */
diff --git a/lib/dvb_si/cell_frequency_link_descriptor.cpp b/lib/dvb_si/cell_frequency_link_descriptor.cpp
deleted file mode 100644 (file)
index f4c4451..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * $Id: cell_frequency_link_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/cell_frequency_link_descriptor.h>
-
-SubcellInfo::SubcellInfo(const uint8_t * const buffer)
-{
-       cellIdExtenstion = buffer[0];
-       transposerFrequency = (buffer[1] << 24) | (buffer[2] << 16) | (buffer[3] << 8) | buffer[4];
-}
-
-uint8_t SubcellInfo::getCellIdExtension(void) const
-{
-       return cellIdExtenstion;
-}
-
-uint32_t SubcellInfo::getTransposerFrequency(void) const
-{
-       return transposerFrequency;
-}
-
-CellFrequencyLink::CellFrequencyLink(const uint8_t * const buffer)
-{
-       cellId = (buffer[0] << 8) | buffer[1];
-       frequency = (buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | buffer[5];
-       subcellInfoLoopLength = buffer[6];
-
-       for (uint16_t i = 0; i < subcellInfoLoopLength; i += 5)
-               subcells.push_back(new SubcellInfo(&buffer[i + 7]));
-}
-
-CellFrequencyLink::~CellFrequencyLink(void)
-{
-       for (SubcellInfoIterator i = subcells.begin(); i != subcells.end(); ++i)
-               delete *i;
-}
-
-uint16_t CellFrequencyLink::getCellId(void) const
-{
-       return cellId;
-}
-
-uint32_t CellFrequencyLink::getFrequency(void) const
-{
-       return frequency;
-}
-
-const SubcellInfoVector *CellFrequencyLink::getSubcells(void) const
-{
-       return &subcells;
-}
-
-CellFrequencyLinkDescriptor::CellFrequencyLinkDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += buffer[i + 10] + 6)
-               cellFrequencyLinks.push_back(new CellFrequencyLink(&buffer[i + 2]));
-}
-
-CellFrequencyLinkDescriptor::~CellFrequencyLinkDescriptor(void)
-{
-       for (CellFrequencyLinkIterator i = cellFrequencyLinks.begin(); i != cellFrequencyLinks.end(); ++i)
-               delete *i;
-}
-
-const CellFrequencyLinkVector *CellFrequencyLinkDescriptor::getCellFrequencyLinks(void) const
-{
-       return &cellFrequencyLinks;
-}
-
diff --git a/lib/dvb_si/cell_frequency_link_descriptor.h b/lib/dvb_si/cell_frequency_link_descriptor.h
deleted file mode 100644 (file)
index 29395eb..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * $Id: cell_frequency_link_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_cell_frequency_link_descriptor_h__
-#define __dvb_descriptor_cell_frequency_link_descriptor_h__
-
-#include "descriptor.h"
-
-class SubcellInfo
-{
-       protected:
-               unsigned cellIdExtenstion                       : 8;
-               unsigned transposerFrequency                    : 32;
-
-       public:
-               SubcellInfo(const uint8_t * const buffer);
-
-               uint8_t getCellIdExtension(void) const;
-               uint32_t getTransposerFrequency(void) const;
-};
-
-typedef std::vector<SubcellInfo *> SubcellInfoVector;
-typedef SubcellInfoVector::iterator SubcellInfoIterator;
-typedef SubcellInfoVector::const_iterator SubcellInfoConstIterator;
-
-class CellFrequencyLink
-{
-       protected:
-               unsigned cellId                                 : 16;
-               unsigned frequency                              : 32;
-               unsigned subcellInfoLoopLength                  : 8;
-               SubcellInfoVector subcells;
-
-       public:
-               CellFrequencyLink(const uint8_t * const buffer);
-               ~CellFrequencyLink(void);
-
-               uint16_t getCellId(void) const;
-               uint32_t getFrequency(void) const;
-               const SubcellInfoVector *getSubcells(void) const;
-
-};
-
-typedef std::vector<CellFrequencyLink *> CellFrequencyLinkVector;
-typedef CellFrequencyLinkVector::iterator CellFrequencyLinkIterator;
-typedef CellFrequencyLinkVector::const_iterator CellFrequencyLinkConstIterator;
-
-class CellFrequencyLinkDescriptor : public Descriptor
-{
-       protected:
-               CellFrequencyLinkVector cellFrequencyLinks;
-
-       public:
-               CellFrequencyLinkDescriptor(const uint8_t * const buffer);
-               ~CellFrequencyLinkDescriptor(void);
-
-               const CellFrequencyLinkVector *getCellFrequencyLinks(void) const;
-};
-
-#endif /* __dvb_descriptor_cell_frequency_link_descriptor_h__ */
diff --git a/lib/dvb_si/cell_list_descriptor.cpp b/lib/dvb_si/cell_list_descriptor.cpp
deleted file mode 100644 (file)
index c8588ae..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * $Id: cell_list_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-
-#include <lib/dvb_si/cell_list_descriptor.h>
-
-Subcell::Subcell(const uint8_t * const buffer)
-{
-       cellIdExtension = buffer[0];
-       subcellLatitude = (buffer[1] << 8) | buffer[2];
-       subcellLongitude = (buffer[3] << 8) | buffer[4];
-       subcellExtendOfLatitude = (buffer[5] << 4) | ((buffer[6] >> 4) & 0x0f);
-       subcellExtendOfLongitude = ((buffer[6] & 0x0f) << 8) | buffer[7];
-}
-
-uint8_t Subcell::getCellIdExtension(void) const
-{
-       return cellIdExtension;
-}
-
-uint16_t Subcell::getSubcellLatitude(void) const
-{
-       return subcellLatitude;
-}
-
-uint16_t Subcell::getSubcellLongtitude(void) const
-{
-       return subcellLongitude;
-}
-
-uint16_t Subcell::getSubcellExtendOfLatitude(void) const
-{
-       return subcellExtendOfLatitude;
-}
-
-uint16_t Subcell::getSubcellExtendOfLongtitude(void) const
-{
-       return subcellExtendOfLongitude;
-}
-
-Cell::Cell(const uint8_t * const buffer)
-{
-       cellId = (buffer[0] << 8) | buffer[1];
-       cellLatitude = (buffer[2] << 8) | buffer[3];
-       cellLongtitude = (buffer[4] << 8) | buffer[5];
-       cellExtendOfLatitude = (buffer[6] << 4) | ((buffer[7] >> 4) & 0x0f);
-       cellExtendOfLongtitude = ((buffer[7] & 0x0f) << 8) | buffer[8];
-       subcellInfoLoopLength = buffer[9];
-
-       for (uint16_t i = 0; i < subcellInfoLoopLength; i += 8)
-               subcells.push_back(new Subcell(&buffer[i + 10]));
-}
-
-Cell::~Cell(void)
-{
-       for (SubcellIterator i = subcells.begin(); i != subcells.end(); ++i)
-               delete *i;
-}
-
-uint16_t Cell::getCellId(void) const
-{
-       return cellId;
-}
-
-uint16_t Cell::getCellLatitude(void) const
-{
-       return cellLatitude;
-}
-
-uint16_t Cell::getCellLongtitude(void) const
-{
-       return cellLongtitude;
-}
-
-uint16_t Cell::getCellExtendOfLatitude(void) const
-{
-       return cellExtendOfLatitude;
-}
-
-uint16_t Cell::getCellExtendOfLongtitude(void) const
-{
-       return cellExtendOfLongtitude;
-}
-
-const SubcellVector *Cell::getSubcells(void) const
-{
-       return &subcells;
-}
-
-CellListDescriptor::CellListDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += buffer[i + 11] + 10)
-               cells.push_back(new Cell(&buffer[i + 2]));
-}
-
-CellListDescriptor::~CellListDescriptor(void)
-{
-       for (CellIterator i = cells.begin(); i != cells.end(); ++i)
-               delete *i;
-}
-
-const CellVector *CellListDescriptor::getCells(void) const
-{
-       return &cells;
-}
-
diff --git a/lib/dvb_si/cell_list_descriptor.h b/lib/dvb_si/cell_list_descriptor.h
deleted file mode 100644 (file)
index cfe93d9..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * $Id: cell_list_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_cell_list_descriptor_h__
-#define __dvb_descriptor_cell_list_descriptor_h__
-
-#include "descriptor.h"
-
-class Subcell
-{
-       protected:
-               unsigned cellIdExtension                        : 8;
-               unsigned subcellLatitude                        : 16;
-               unsigned subcellLongitude                       : 16;
-               unsigned subcellExtendOfLatitude                : 12;
-               unsigned subcellExtendOfLongitude               : 12;
-
-       public:
-               Subcell(const uint8_t * const buffer);
-
-               uint8_t getCellIdExtension(void) const;
-               uint16_t getSubcellLatitude(void) const;
-               uint16_t getSubcellLongtitude(void) const;
-               uint16_t getSubcellExtendOfLatitude(void) const;
-               uint16_t getSubcellExtendOfLongtitude(void) const;
-};
-
-typedef std::vector<Subcell *> SubcellVector;
-typedef SubcellVector::iterator SubcellIterator;
-typedef SubcellVector::const_iterator SubcellConstIterator;
-
-class Cell
-{
-       protected:
-               unsigned cellId                                 : 16;
-               unsigned cellLatitude                           : 16;
-               unsigned cellLongtitude                         : 16;
-               unsigned cellExtendOfLatitude                   : 12;
-               unsigned cellExtendOfLongtitude                 : 12;
-               unsigned subcellInfoLoopLength                  : 8;
-               SubcellVector subcells;
-
-       public:
-               Cell(const uint8_t * const buffer);
-               ~Cell(void);
-
-               uint16_t getCellId(void) const;
-               uint16_t getCellLatitude(void) const;
-               uint16_t getCellLongtitude(void) const;
-               uint16_t getCellExtendOfLatitude(void) const;
-               uint16_t getCellExtendOfLongtitude(void) const;
-               const SubcellVector *getSubcells(void) const;
-};
-
-typedef std::vector<Cell *> CellVector;
-typedef CellVector::iterator CellIterator;
-typedef CellVector::const_iterator CellConstIterator;
-
-class CellListDescriptor : public Descriptor
-{
-       protected:
-               CellVector cells;
-
-       public:
-               CellListDescriptor(const uint8_t * const buffer);
-               ~CellListDescriptor(void);
-
-               const CellVector *getCells(void) const;
-};
-
-#endif /* __dvb_descriptor_cell_list_descriptor_h__ */
diff --git a/lib/dvb_si/component_descriptor.cpp b/lib/dvb_si/component_descriptor.cpp
deleted file mode 100644 (file)
index 8b043e1..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * $Id: component_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/component_descriptor.h>
-
-ComponentDescriptor::ComponentDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       reserved = (buffer[2] >> 4) & 0x0f;
-       streamContent = buffer[2] & 0x0f;
-       componentType = buffer[3];
-       componentTag = buffer[4];
-       iso639LanguageCode.assign((char *) &buffer[5], 3);
-       if (descriptorLength < 6)
-               return;
-       text.assign((char *) &buffer[8], descriptorLength - 6);
-}
-
-uint8_t ComponentDescriptor::getStreamContent(void) const
-{
-       return streamContent;
-}
-
-uint8_t ComponentDescriptor::getComponentType(void) const
-{
-       return componentType;
-}
-
-uint8_t ComponentDescriptor::getComponentTag(void) const
-{
-       return componentTag;
-}
-
-std::string ComponentDescriptor::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-std::string ComponentDescriptor::getText(void) const
-{
-       return text;
-}
-
diff --git a/lib/dvb_si/component_descriptor.h b/lib/dvb_si/component_descriptor.h
deleted file mode 100644 (file)
index c910ad4..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $Id: component_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_component_descriptor_h__
-#define __dvb_descriptor_component_descriptor_h__
-
-#include "descriptor.h"
-
-class ComponentDescriptor : public Descriptor
-{
-       protected:
-               unsigned reserved                               : 4;
-               unsigned streamContent                          : 4;
-               unsigned componentType                          : 8;
-               unsigned componentTag                           : 8;
-               std::string iso639LanguageCode;
-               std::string text;
-
-       public:
-               ComponentDescriptor(const uint8_t * const buffer);
-
-               uint8_t getStreamContent(void) const;
-               uint8_t getComponentType(void) const;
-               uint8_t getComponentTag(void) const;
-               std::string getIso639LanguageCode(void) const;
-               std::string getText(void) const;
-};
-
-#endif /* __dvb_descriptor_component_descriptor_h__ */
diff --git a/lib/dvb_si/container.cpp b/lib/dvb_si/container.cpp
deleted file mode 100644 (file)
index 1c14c2f..0000000
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * $Id: container.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/ac3_descriptor.h>
-#include <lib/dvb_si/ancillary_data_descriptor.h>
-#include <lib/dvb_si/announcement_support_descriptor.h>
-#include <lib/dvb_si/application_signalling_descriptor.h>
-#include <lib/dvb_si/audio_stream_descriptor.h>
-#include <lib/dvb_si/bouquet_name_descriptor.h>
-#include <lib/dvb_si/ca_descriptor.h>
-#include <lib/dvb_si/ca_identifier_descriptor.h>
-#include <lib/dvb_si/ca_system_descriptor.h>
-#include <lib/dvb_si/cable_delivery_system_descriptor.h>
-#include <lib/dvb_si/cell_frequency_link_descriptor.h>
-#include <lib/dvb_si/cell_list_descriptor.h>
-#include <lib/dvb_si/component_descriptor.h>
-#include <lib/dvb_si/container.h>
-#include <lib/dvb_si/content_descriptor.h>
-#include <lib/dvb_si/country_availability_descriptor.h>
-#include <lib/dvb_si/data_broadcast_descriptor.h>
-#include <lib/dvb_si/data_broadcast_id_descriptor.h>
-#include <lib/dvb_si/extended_event_descriptor.h>
-#include <lib/dvb_si/frequency_list_descriptor.h>
-#include <lib/dvb_si/iso639_language_descriptor.h>
-#include <lib/dvb_si/linkage_descriptor.h>
-#include <lib/dvb_si/local_time_offset_descriptor.h>
-#include <lib/dvb_si/mosaic_descriptor.h>
-#include <lib/dvb_si/multilingual_bouquet_name_descriptor.h>
-#include <lib/dvb_si/multilingual_component_descriptor.h>
-#include <lib/dvb_si/multilingual_network_name_descriptor.h>
-#include <lib/dvb_si/multilingual_service_name_descriptor.h>
-#include <lib/dvb_si/network_name_descriptor.h>
-#include <lib/dvb_si/nvod_reference_descriptor.h>
-#include <lib/dvb_si/parental_rating_descriptor.h>
-#include <lib/dvb_si/pdc_descriptor.h>
-#include <lib/dvb_si/private_data_specifier_descriptor.h>
-#include <lib/dvb_si/satellite_delivery_system_descriptor.h>
-#include <lib/dvb_si/service_descriptor.h>
-#include <lib/dvb_si/service_list_descriptor.h>
-#include <lib/dvb_si/service_move_descriptor.h>
-#include <lib/dvb_si/short_event_descriptor.h>
-#include <lib/dvb_si/stream_identifier_descriptor.h>
-#include <lib/dvb_si/stuffing_descriptor.h>
-#include <lib/dvb_si/subtitling_descriptor.h>
-#include <lib/dvb_si/target_background_grid_descriptor.h>
-#include <lib/dvb_si/telephone_descriptor.h>
-#include <lib/dvb_si/teletext_descriptor.h>
-#include <lib/dvb_si/terrestrial_delivery_system_descriptor.h>
-#include <lib/dvb_si/time_shifted_service_descriptor.h>
-#include <lib/dvb_si/vbi_data_descriptor.h>
-#include <lib/dvb_si/vbi_teletext_descriptor.h>
-#include <lib/dvb_si/video_stream_descriptor.h>
-#include <lib/dvb_si/video_window_descriptor.h>
-#include <lib/dvb_si/descriptor_tag.h>
-
-DescriptorContainer::~DescriptorContainer(void)
-{
-       for (DescriptorIterator i = descriptorVector.begin(); i != descriptorVector.end(); ++i)
-               delete *i;
-}
-
-void DescriptorContainer::descriptor(const uint8_t * const buffer)
-{
-       switch (buffer[0]) {
-       case VIDEO_STREAM_DESCRIPTOR:
-               descriptorVector.push_back(new VideoStreamDescriptor(buffer));
-               break;
-
-       case AUDIO_STREAM_DESCRIPTOR:
-               descriptorVector.push_back(new AudioStreamDescriptor(buffer));
-               break;
-
-       case TARGET_BACKGROUND_GRID_DESCRIPTOR:
-               descriptorVector.push_back(new TargetBackgroundGridDescriptor(buffer));
-               break;
-
-       case VIDEO_WINDOW_DESCRIPTOR:
-               descriptorVector.push_back(new VideoWindowDescriptor(buffer));
-               break;
-
-       case CA_DESCRIPTOR:
-               descriptorVector.push_back(new CaDescriptor(buffer));
-               break;
-
-       case ISO_639_LANGUAGE_DESCRIPTOR:
-               descriptorVector.push_back(new Iso639LanguageDescriptor(buffer));
-               break;
-
-       case NETWORK_NAME_DESCRIPTOR:
-               descriptorVector.push_back(new NetworkNameDescriptor(buffer));
-               break;
-
-       case SERVICE_LIST_DESCRIPTOR:
-               descriptorVector.push_back(new ServiceListDescriptor(buffer));
-               break;
-
-       case STUFFING_DESCRIPTOR:
-               descriptorVector.push_back(new StuffingDescriptor(buffer));
-               break;
-
-       case SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR:
-               descriptorVector.push_back(new SatelliteDeliverySystemDescriptor(buffer));
-               break;
-
-       case CABLE_DELIVERY_SYSTEM_DESCRIPTOR:
-               descriptorVector.push_back(new CableDeliverySystemDescriptor(buffer));
-               break;
-
-       case VBI_DATA_DESCRIPTOR:
-               descriptorVector.push_back(new VbiDataDescriptor(buffer));
-               break;
-
-       case VBI_TELETEXT_DESCRIPTOR:
-               descriptorVector.push_back(new VbiTeletextDescriptor(buffer));
-               break;
-
-       case BOUQUET_NAME_DESCRIPTOR:
-               descriptorVector.push_back(new BouquetNameDescriptor(buffer));
-               break;
-
-       case SERVICE_DESCRIPTOR:
-               descriptorVector.push_back(new ServiceDescriptor(buffer));
-               break;
-
-       case COUNTRY_AVAILABILITY_DESCRIPTOR:
-               descriptorVector.push_back(new CountryAvailabilityDescriptor(buffer));
-               break;
-
-       case LINKAGE_DESCRIPTOR:
-               descriptorVector.push_back(new LinkageDescriptor(buffer));
-               break;
-
-       case NVOD_REFERENCE_DESCRIPTOR:
-               descriptorVector.push_back(new NvodReferenceDescriptor(buffer));
-               break;
-
-       case TIME_SHIFTED_SERVICE_DESCRIPTOR:
-               descriptorVector.push_back(new TimeShiftedServiceDescriptor(buffer));
-               break;
-
-       case SHORT_EVENT_DESCRIPTOR:
-               descriptorVector.push_back(new ShortEventDescriptor(buffer));
-               break;
-
-       case EXTENDED_EVENT_DESCRIPTOR:
-               descriptorVector.push_back(new ExtendedEventDescriptor(buffer));
-               break;
-
-       case COMPONENT_DESCRIPTOR:
-               descriptorVector.push_back(new ComponentDescriptor(buffer));
-               break;
-
-       case MOSAIC_DESCRIPTOR:
-               descriptorVector.push_back(new MosaicDescriptor(buffer));
-               break;
-
-       case STREAM_IDENTIFIER_DESCRIPTOR:
-               descriptorVector.push_back(new StreamIdentifierDescriptor(buffer));
-               break;
-
-       case CA_IDENTIFIER_DESCRIPTOR:
-               descriptorVector.push_back(new CaIdentifierDescriptor(buffer));
-               break;
-
-       case CONTENT_DESCRIPTOR:
-               descriptorVector.push_back(new ContentDescriptor(buffer));
-               break;
-
-       case PARENTAL_RATING_DESCRIPTOR:
-               descriptorVector.push_back(new ParentalRatingDescriptor(buffer));
-               break;
-
-       case TELETEXT_DESCRIPTOR:
-               descriptorVector.push_back(new TeletextDescriptor(buffer));
-               break;
-
-       case TELEPHONE_DESCRIPTOR:
-               descriptorVector.push_back(new TelephoneDescriptor(buffer));
-               break;
-
-       case LOCAL_TIME_OFFSET_DESCRIPTOR:
-               descriptorVector.push_back(new LocalTimeOffsetDescriptor(buffer));
-               break;
-
-       case SUBTITLING_DESCRIPTOR:
-               descriptorVector.push_back(new SubtitlingDescriptor(buffer));
-               break;
-
-       case TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR:
-               descriptorVector.push_back(new TerrestrialDeliverySystemDescriptor(buffer));
-               break;
-
-       case MULTILINGUAL_NETWORK_NAME_DESCRIPTOR:
-               descriptorVector.push_back(new MultilingualNetworkNameDescriptor(buffer));
-               break;
-
-       case MULTILINGUAL_BOUQUET_NAME_DESCRIPTOR:
-               descriptorVector.push_back(new MultilingualBouquetNameDescriptor(buffer));
-               break;
-
-       case MULTILINGUAL_SERVICE_NAME_DESCRIPTOR:
-               descriptorVector.push_back(new MultilingualServiceNameDescriptor(buffer));
-               break;
-
-       case MULTILINGUAL_COMPONENT_DESCRIPTOR:
-               descriptorVector.push_back(new MultilingualComponentDescriptor(buffer));
-               break;
-
-       case PRIVATE_DATA_SPECIFIER_DESCRIPTOR:
-               descriptorVector.push_back(new PrivateDataSpecifierDescriptor(buffer));
-               break;
-
-       case SERVICE_MOVE_DESCRIPTOR:
-               descriptorVector.push_back(new ServiceMoveDescriptor(buffer));
-               break;
-
-       case FREQUENCY_LIST_DESCRIPTOR:
-               descriptorVector.push_back(new FrequencyListDescriptor(buffer));
-               break;
-
-       case DATA_BROADCAST_DESCRIPTOR:
-               descriptorVector.push_back(new DataBroadcastDescriptor(buffer));
-               break;
-
-       case CA_SYSTEM_DESCRIPTOR:
-               descriptorVector.push_back(new CaSystemDescriptor(buffer));
-               break;
-
-       case DATA_BROADCAST_ID_DESCRIPTOR:
-               descriptorVector.push_back(new DataBroadcastIdDescriptor(buffer));
-               break;
-
-       case PDC_DESCRIPTOR:
-               descriptorVector.push_back(new PdcDescriptor(buffer));
-               break;
-
-       case AC3_DESCRIPTOR:
-               descriptorVector.push_back(new Ac3Descriptor(buffer));
-               break;
-
-       case ANCILLARY_DATA_DESCRIPTOR:
-               descriptorVector.push_back(new AncillaryDataDescriptor(buffer));
-               break;
-
-       case CELL_LIST_DESCRIPTOR:
-               descriptorVector.push_back(new CellListDescriptor(buffer));
-               break;
-
-       case CELL_FREQUENCY_LINK_DESCRIPTOR:
-               descriptorVector.push_back(new CellFrequencyLinkDescriptor(buffer));
-               break;
-
-       case ANNOUNCEMENT_SUPPORT_DESCRIPTOR:
-               descriptorVector.push_back(new AnnouncementSupportDescriptor(buffer));
-               break;
-
-       case APPLICATION_SIGNALLING_DESCRIPTOR:
-               descriptorVector.push_back(new ApplicationSignallingDescriptor(buffer));
-               break;
-
-       default:
-               descriptorVector.push_back(new Descriptor(buffer));
-               break;
-       }
-}
-
-const DescriptorVector *DescriptorContainer::getDescriptors(void) const
-{
-       return &descriptorVector;
-}
-
diff --git a/lib/dvb_si/container.h b/lib/dvb_si/container.h
deleted file mode 100644 (file)
index 9d1d5e3..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $Id: container.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_container_h__
-#define __dvb_descriptor_container_h__
-
-#include "descriptor.h"
-
-class DescriptorContainer
-{
-       protected:
-               void descriptor(const uint8_t * const buffer);
-               DescriptorVector descriptorVector;
-
-       public:
-               ~DescriptorContainer(void);
-
-               const DescriptorVector *getDescriptors(void) const;
-};
-
-#endif /* __dvb_descriptor_container_h__ */
diff --git a/lib/dvb_si/content_descriptor.cpp b/lib/dvb_si/content_descriptor.cpp
deleted file mode 100644 (file)
index b8996a4..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * $Id: content_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/content_descriptor.h>
-
-ContentClassification::ContentClassification(const uint8_t * const buffer)
-{
-       contentNibbleLevel1 = (buffer[0] >> 4) & 0x0f;
-       contentNibbleLevel2 = buffer[0] & 0x0f;
-       userNibble1 = (buffer[1] >> 4) & 0x0f;
-       userNibble2 = buffer[1] & 0x0f;
-}
-
-uint8_t ContentClassification::getContentNibbleLevel1(void) const
-{
-       return contentNibbleLevel1;
-}
-
-uint8_t ContentClassification::getContentNibbleLevel2(void) const
-{
-       return contentNibbleLevel2;
-}
-
-uint8_t ContentClassification::getUserNibble1(void) const
-{
-       return userNibble1;
-}
-
-uint8_t ContentClassification::getUserNibble2(void) const
-{
-       return userNibble2;
-}
-
-ContentDescriptor::ContentDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += 2)
-               classifications.push_back(new ContentClassification(&buffer[i + 2]));
-}
-
-ContentDescriptor::~ContentDescriptor(void)
-{
-       for (ContentClassificationVector::iterator i = classifications.begin(); i != classifications.end(); ++i)
-               delete *i;
-}
-
-const ContentClassificationVector *ContentDescriptor::getClassifications(void) const
-{
-       return &classifications;
-}
-
diff --git a/lib/dvb_si/content_descriptor.h b/lib/dvb_si/content_descriptor.h
deleted file mode 100644 (file)
index 31f4e71..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * $Id: content_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_content_descriptor_h__
-#define __dvb_descriptor_content_descriptor_h__
-
-#include "descriptor.h"
-
-class ContentClassification
-{
-       protected:
-               unsigned contentNibbleLevel1                    : 4;
-               unsigned contentNibbleLevel2                    : 4;
-               unsigned userNibble1                            : 4;
-               unsigned userNibble2                            : 4;
-
-       public:
-               ContentClassification(const uint8_t * const buffer);
-
-               uint8_t getContentNibbleLevel1(void) const;
-               uint8_t getContentNibbleLevel2(void) const;
-               uint8_t getUserNibble1(void) const;
-               uint8_t getUserNibble2(void) const;
-};
-
-typedef std::vector<ContentClassification *> ContentClassificationVector;
-typedef ContentClassificationVector::iterator ContentClassificationIterator;
-typedef ContentClassificationVector::const_iterator ContentClassificationConstIterator;
-
-class ContentDescriptor : public Descriptor
-{
-       protected:
-               ContentClassificationVector classifications;
-
-       public:
-               ContentDescriptor(const uint8_t * const buffer);
-               ~ContentDescriptor(void);
-
-               const ContentClassificationVector *getClassifications(void) const;
-};
-
-#endif /* __dvb_descriptor_content_descriptor_h__ */
diff --git a/lib/dvb_si/copyright_descriptor.h b/lib/dvb_si/copyright_descriptor.h
deleted file mode 100644 (file)
index 89d0c28..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: copyright_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_copyright_descriptor_h__
-#define __dvb_descriptor_copyright_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> AdditionalCopyrightInfoVector;
-typedef AdditionalCopyrightInfoVector::iterator AdditionalCopyrightInfoIterator;
-typedef AdditionalCopyrightInfoVector::const_iterator AdditionalCopyrightInfoConstIterator;
-
-class CopyrightDescriptor : public Descriptor
-{
-       protected:
-               unsigned copyrightIdentifier                    : 32;
-               AdditionalCopyrightInfoVector additionalCopyrightInfo;
-
-       public:
-               CopyrightDescriptor(const uint8_t * const buffer);
-
-               uint32_t getCopyrightIdentifier(void) const;
-               const AdditionalCopyrightInfoVector *getAdditionalCopyrightInfo(void) const;
-};
-
-#endif /* __dvb_descriptor_copyright_descriptor_h__ */
diff --git a/lib/dvb_si/country_availability_descriptor.cpp b/lib/dvb_si/country_availability_descriptor.cpp
deleted file mode 100644 (file)
index 7aa37ff..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $Id: country_availability_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/country_availability_descriptor.h>
-
-CountryAvailabilityDescriptor::CountryAvailabilityDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       std::string countryCode;
-       countryAvailabilityFlag = (buffer[2] >> 7) & 0x01;
-
-       if (descriptorLength < 1)
-               return;
-
-       for (uint16_t i = 0; i < descriptorLength - 1; i += 3) {
-               countryCode.assign((char *)&buffer[i + 3], 3);
-               countryCodes.push_back(countryCode);
-       }
-}
-
-uint8_t CountryAvailabilityDescriptor::getCountryAvailabilityFlag(void) const
-{
-       return countryAvailabilityFlag;
-}
-
-const CountryCodeVector *CountryAvailabilityDescriptor::getCountryCodes(void) const
-{
-       return &countryCodes;
-}
-
diff --git a/lib/dvb_si/country_availability_descriptor.h b/lib/dvb_si/country_availability_descriptor.h
deleted file mode 100644 (file)
index baa0b84..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * $Id: country_availability_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_country_availability_descriptor_h__
-#define __dvb_descriptor_country_availability_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<std::string> CountryCodeVector;
-typedef CountryCodeVector::iterator CountryCodeIterator;
-typedef CountryCodeVector::const_iterator CountryCodeConstIterator;
-
-class CountryAvailabilityDescriptor : public Descriptor
-{
-       protected:
-               unsigned countryAvailabilityFlag                : 1;
-               unsigned reserved                               : 7;
-               CountryCodeVector countryCodes;
-
-       public:
-               CountryAvailabilityDescriptor(const uint8_t * const buffer);
-
-               uint8_t getCountryAvailabilityFlag(void) const;
-               const CountryCodeVector *getCountryCodes(void) const;
-};
-
-#endif /* __dvb_descriptor_country_availability_descriptor_h__ */
diff --git a/lib/dvb_si/data_broadcast_descriptor.cpp b/lib/dvb_si/data_broadcast_descriptor.cpp
deleted file mode 100644 (file)
index b5f8b2a..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * $Id: data_broadcast_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/data_broadcast_descriptor.h>
-
-DataBroadcastDescriptor::DataBroadcastDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       dataBroadcastId = (buffer[2] << 8) | buffer[3];
-       componentTag = buffer[3];
-       selectorLength = buffer[4];
-
-       for (uint16_t i = 0; i < selectorLength; ++i)
-               selectorBytes.push_back(buffer[i + 5]);
-
-       iso639LanguageCode.assign((char *)&buffer[selectorLength + 5], 3);
-       textLength = buffer[selectorLength + 8];
-       text.assign((char *)&buffer[selectorLength + 9], textLength);
-}
-
-uint16_t DataBroadcastDescriptor::getDataBroadcastId(void) const
-{
-       return dataBroadcastId;
-}
-
-uint8_t DataBroadcastDescriptor::getComponentTag(void) const
-{
-       return componentTag;
-}
-
-const selectorByteVector *DataBroadcastDescriptor::getSelectorBytes(void) const
-{
-       return &selectorBytes;
-}
-
-std::string DataBroadcastDescriptor::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-std::string DataBroadcastDescriptor::getText(void) const
-{
-       return text;
-}
-
diff --git a/lib/dvb_si/data_broadcast_descriptor.h b/lib/dvb_si/data_broadcast_descriptor.h
deleted file mode 100644 (file)
index aa5bb5d..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * $Id: data_broadcast_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_data_broadcast_descriptor_h__
-#define __dvb_descriptor_data_broadcast_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> selectorByteVector;
-typedef selectorByteVector::iterator selectorByteIterator;
-typedef selectorByteVector::const_iterator selectorByteConstIterator;
-
-class DataBroadcastDescriptor : public Descriptor
-{
-       protected:
-               unsigned dataBroadcastId                        : 16;
-               unsigned componentTag                           : 8;
-               unsigned selectorLength                         : 8;
-               selectorByteVector selectorBytes;
-               std::string iso639LanguageCode;
-               unsigned textLength                             : 8;
-               std::string text;
-
-       public:
-               DataBroadcastDescriptor(const uint8_t * const buffer);
-
-               uint16_t getDataBroadcastId(void) const;
-               uint8_t getComponentTag(void) const;
-               const selectorByteVector *getSelectorBytes(void) const;
-               std::string getIso639LanguageCode(void) const;
-               std::string getText(void) const;
-};
-
-#endif /* __dvb_descriptor_data_broadcast_descriptor_h__ */
diff --git a/lib/dvb_si/data_broadcast_id_descriptor.cpp b/lib/dvb_si/data_broadcast_id_descriptor.cpp
deleted file mode 100644 (file)
index 2e058c4..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: data_broadcast_id_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/data_broadcast_id_descriptor.h>
-
-DataBroadcastIdDescriptor::DataBroadcastIdDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       if (descriptorLength < 2)
-               return;
-
-       dataBroadcastId = (buffer[2] << 8) | buffer[3];
-
-       for (uint16_t i = 0; i < descriptorLength - 2; ++i)
-               idSelectorBytes.push_back(buffer[i + 4]);
-}
-
-uint16_t DataBroadcastIdDescriptor::getDataBroadcastId(void) const
-{
-       return dataBroadcastId;
-}
-
-const IdSelectorByteVector *DataBroadcastIdDescriptor::getIdSelectorBytes(void) const
-{
-       return &idSelectorBytes;
-}
-
diff --git a/lib/dvb_si/data_broadcast_id_descriptor.h b/lib/dvb_si/data_broadcast_id_descriptor.h
deleted file mode 100644 (file)
index a933c6e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: data_broadcast_id_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_data_broadcast_id_descriptor_h__
-#define __dvb_descriptor_data_broadcast_id_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> IdSelectorByteVector;
-typedef IdSelectorByteVector::iterator IdSelectorByteIterator;
-typedef IdSelectorByteVector::const_iterator IdSelectorByteConstIterator;
-
-class DataBroadcastIdDescriptor : public Descriptor
-{
-       protected:
-               unsigned dataBroadcastId                        : 16;
-               IdSelectorByteVector idSelectorBytes;
-
-       public:
-               DataBroadcastIdDescriptor(const uint8_t * const buffer);
-
-               uint16_t getDataBroadcastId(void) const;
-               const IdSelectorByteVector *getIdSelectorBytes(void) const;
-};
-
-#endif /* __dvb_descriptor_data_broadcast_id_descriptor_h__ */
diff --git a/lib/dvb_si/data_stream_alignment_descriptor.h b/lib/dvb_si/data_stream_alignment_descriptor.h
deleted file mode 100644 (file)
index 988cb6d..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $Id: data_stream_alignment_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_data_stream_alignment_descriptor_h__
-#define __dvb_descriptor_data_stream_alignment_descriptor_h__
-
-#include "descriptor.h"
-
-class DataStreamAlignmentDescriptor : public Descriptor
-{
-       protected:
-               unsigned alignmentType                          : 8;
-
-       private:
-               DataStreamAlignmentDescriptor(const uint8_t * const buffer);
-
-               uint8_t getAlignmentType(void) const;
-};
-
-#endif /* __dvb_descriptor_data_stream_alignment_descriptor_h__ */
diff --git a/lib/dvb_si/descriptor.cpp b/lib/dvb_si/descriptor.cpp
deleted file mode 100644 (file)
index f81ed9a..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $Id: descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/descriptor.h>
-
-Descriptor::Descriptor(const uint8_t * const buffer)
-{
-       descriptorTag = buffer[0];
-       descriptorLength = buffer[1];
-}
-
-uint8_t Descriptor::getTag(void) const
-{
-       return descriptorTag;
-}
-
-uint8_t Descriptor::getLength(void) const
-{
-       return descriptorLength;
-}
-
diff --git a/lib/dvb_si/descriptor.h b/lib/dvb_si/descriptor.h
deleted file mode 100644 (file)
index 3572cce..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * $Id: descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_descriptor_h__
-#define __dvb_descriptor_descriptor_h__
-
-#include <string>
-#include <vector>
-#include <inttypes.h>
-
-class Descriptor
-{
-       protected:
-               unsigned descriptorTag                          : 8;
-               unsigned descriptorLength                       : 8;
-
-       public:
-               Descriptor(const uint8_t * const buffer);
-
-               uint8_t getTag(void) const;
-               uint8_t getLength(void) const;
-};
-
-typedef std::vector<Descriptor *> DescriptorVector;
-typedef DescriptorVector::iterator DescriptorIterator;
-typedef DescriptorVector::const_iterator DescriptorConstIterator;
-
-#endif /* __dvb_descriptor_descriptor_h__ */
diff --git a/lib/dvb_si/descriptor_tag.h b/lib/dvb_si/descriptor_tag.h
deleted file mode 100644 (file)
index c3f8327..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * $Id: descriptor_tag.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_id_descriptor_tag_h__
-#define __dvb_id_descriptor_tag_h__
-
-enum DescriptorTag {
-       /* 0x00 - 0x3F: ITU-T Rec. H.222.0 | ISO/IEC 13818-1 */
-       VIDEO_STREAM_DESCRIPTOR                         = 0x02,
-       AUDIO_STREAM_DESCRIPTOR                         = 0x03,
-       HIERARCHY_DESCRIPTOR                            = 0x04,
-       REGISTRATION_DESCRIPTOR                         = 0x05,
-       DATA_STREAM_ALIGNMENT_DESCRIPTOR                = 0x06,
-       TARGET_BACKGROUND_GRID_DESCRIPTOR               = 0x07,
-       VIDEO_WINDOW_DESCRIPTOR                         = 0x08,
-       CA_DESCRIPTOR                                   = 0x09,
-       ISO_639_LANGUAGE_DESCRIPTOR                     = 0x0A,
-       SYSTEM_CLOCK_DESCRIPTOR                         = 0x0B,
-       MULTIPLEX_BUFFER_UTILIZATION_DESCRIPTOR         = 0x0C,
-       COPYRIGHT_DESCRIPTOR                            = 0x0D,
-       MAXIMUM_BITRATE_DESCRIPTOR                      = 0x0E,
-       PRIVATE_DATA_INDICATOR_DESCRIPTOR               = 0x0F,
-       SMOOTHING_BUFFER_DESCRIPTOR                     = 0x10,
-       STD_DESCRIPTOR                                  = 0x11,
-       IBP_DESCRIPTOR                                  = 0x12,
-       CAROUSEL_IDENTIFIER_DESCRIPTOR                  = 0x13,
-       /* 0x40 - 0x7F: ETSI EN 300 468 V1.5.1 (2003-01) */
-       NETWORK_NAME_DESCRIPTOR                         = 0x40,
-       SERVICE_LIST_DESCRIPTOR                         = 0x41,
-       STUFFING_DESCRIPTOR                             = 0x42,
-       SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR            = 0x43,
-       CABLE_DELIVERY_SYSTEM_DESCRIPTOR                = 0x44,
-       VBI_DATA_DESCRIPTOR                             = 0x45,
-       VBI_TELETEXT_DESCRIPTOR                         = 0x46,
-       BOUQUET_NAME_DESCRIPTOR                         = 0x47,
-       SERVICE_DESCRIPTOR                              = 0x48,
-       COUNTRY_AVAILABILITY_DESCRIPTOR                 = 0x49,
-       LINKAGE_DESCRIPTOR                              = 0x4A,
-       NVOD_REFERENCE_DESCRIPTOR                       = 0x4B,
-       TIME_SHIFTED_SERVICE_DESCRIPTOR                 = 0x4C,
-       SHORT_EVENT_DESCRIPTOR                          = 0x4D,
-       EXTENDED_EVENT_DESCRIPTOR                       = 0x4E,
-       TIME_SHIFTED_EVENT_DESCRIPTOR                   = 0x4F,
-       COMPONENT_DESCRIPTOR                            = 0x50,
-       MOSAIC_DESCRIPTOR                               = 0x51,
-       STREAM_IDENTIFIER_DESCRIPTOR                    = 0x52,
-       CA_IDENTIFIER_DESCRIPTOR                        = 0x53,
-       CONTENT_DESCRIPTOR                              = 0x54,
-       PARENTAL_RATING_DESCRIPTOR                      = 0x55,
-       TELETEXT_DESCRIPTOR                             = 0x56,
-       TELEPHONE_DESCRIPTOR                            = 0x57,
-       LOCAL_TIME_OFFSET_DESCRIPTOR                    = 0x58,
-       SUBTITLING_DESCRIPTOR                           = 0x59,
-       TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR          = 0x5A,
-       MULTILINGUAL_NETWORK_NAME_DESCRIPTOR            = 0x5B,
-       MULTILINGUAL_BOUQUET_NAME_DESCRIPTOR            = 0x5C,
-       MULTILINGUAL_SERVICE_NAME_DESCRIPTOR            = 0x5D,
-       MULTILINGUAL_COMPONENT_DESCRIPTOR               = 0x5E,
-       PRIVATE_DATA_SPECIFIER_DESCRIPTOR               = 0x5F,
-       SERVICE_MOVE_DESCRIPTOR                         = 0x60,
-       SHORT_SMOOTHING_BUFFER_DESCRIPTOR               = 0x61,
-       FREQUENCY_LIST_DESCRIPTOR                       = 0x62,
-       PARTIAL_TRANSPORT_STREAM_DESCRIPTOR             = 0x63,
-       DATA_BROADCAST_DESCRIPTOR                       = 0x64,
-       CA_SYSTEM_DESCRIPTOR                            = 0x65,
-       DATA_BROADCAST_ID_DESCRIPTOR                    = 0x66,
-       TRANSPORT_STREAM_DESCRIPTOR                     = 0x67,
-       DSNG_DESCRIPTOR                                 = 0x68,
-       PDC_DESCRIPTOR                                  = 0x69,
-       AC3_DESCRIPTOR                                  = 0x6A,
-       ANCILLARY_DATA_DESCRIPTOR                       = 0x6B,
-       CELL_LIST_DESCRIPTOR                            = 0x6C,
-       CELL_FREQUENCY_LINK_DESCRIPTOR                  = 0x6D,
-       ANNOUNCEMENT_SUPPORT_DESCRIPTOR                 = 0x6E,
-       APPLICATION_SIGNALLING_DESCRIPTOR               = 0x6F,
-       ADAPTATION_FIELD_DATA_DESCRIPTOR                = 0x70,
-       SERVICE_IDENTIFIER_DESCRIPTOR                   = 0x71,
-       SERVICE_AVAILABILITY_DESCRIPTOR                 = 0x72,
-       /* 0x80 - 0xFE: user defined */
-       VIASAT_LOGIC_CHANNEL_DESCRIPTOR                 = 0x82,
-       NORDIG_LOGIC_CHANNEL_DESCRIPTOR                 = 0x83,
-       EACEM_LOGIC_CHANNEL_DESCRIPTOR                  = 0x83,
-       EACEM_PREFERRED_NAME_LIST_DESCRIPTOR            = 0x84,
-       EACEM_PREFERRED_NAME_IDENTIFIER_DESCRIPTOR      = 0x85,
-       EACEM_STREAM_IDENTIFIER_DESCRIPTOR              = 0x86,
-       SENDA_CHANNEL_LIST_DESCRIPTOR                   = 0xF1,
-       /* 0xFF: Forbidden */
-       FORBIDDEN_DESCRIPTOR                            = 0xFF
-};
-
-enum MhpDescriptorTag {
-       /* ETSI TS 101 812 V1.2.1 (2002-06) */
-       APPLICATION_DESCRIPTOR                          = 0x00,
-       APPLICATION_NAME_DESCRIPTOR                     = 0x01,
-       TRANSPORT_PROTOCOL_DESCRIPTOR                   = 0x02,
-       DVB_J_APPLICATION_DESCRIPTOR                    = 0x03,
-       DVB_J_APPLICATION_LOCATION_DESCRIPTOR           = 0x04,
-       EXTERNAL_APPLICATION_AUTHORISATION_DESCRIPTOR   = 0x05,
-       ROUTING_DESCRIPTOR_IP4                          = 0x06,
-       ROUTING_DESCRIPTOR_IP6                          = 0x07,
-       DVB_HTML_APPLICATION_DESCRIPTOR                 = 0x08,
-       DVB_HTML_APPLICATION_LOCATION_DESCRIPTOR        = 0x09,
-       DVB_HTML_APPLICATION_BOUNDARY_DESCRIPTOR        = 0x0A,
-       APPLICATION_ICONS_DESCRIPTOR                    = 0x0B,
-       PREFETCH_DESCRIPTOR                             = 0x0C,
-       DII_LOCATION_DESCRIPTOR                         = 0x0D,
-};
-
-#endif /* __dvb_id_descriptor_tag_h__ */
diff --git a/lib/dvb_si/dsng_descriptor.h b/lib/dvb_si/dsng_descriptor.h
deleted file mode 100644 (file)
index f12d554..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $Id: dsng_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_dsng_descriptor_h__
-#define __dvb_descriptor_dsng_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> ByteVector;
-typedef ByteVector::iterator ByteIterator;
-typedef ByteVector::const_iterator ByteConstIterator;
-
-class DsngDescriptor : public Descriptor
-{
-       protected:
-               ByteVector bytes;
-
-       public:
-               DsngDescriptor(const uint8_t * const buffer);
-
-               const ByteVector *getBytes(void) const;
-};
-
-#endif /* __dvb_descriptor_dsng_descriptor_h__ */
diff --git a/lib/dvb_si/eit.cpp b/lib/dvb_si/eit.cpp
deleted file mode 100644 (file)
index cf7c02b..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * $Id: eit.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/eit.h>
-
-Event::Event(const uint8_t * const buffer)
-{
-       eventId = (buffer[0] << 8) | buffer[1];
-       startTimeMjd = (buffer[2] << 8) | buffer[3];
-       startTimeBcd = (buffer[4] << 16) | (buffer[5] << 8) | buffer[6];
-       duration = (buffer[7] << 16) | (buffer[8] << 8) | buffer[9];
-       runningStatus = (buffer[10] >> 5) & 0x07;
-       freeCaMode = (buffer[10] >> 4) & 0x01;
-       descriptorsLoopLength = ((buffer[10] & 0x0f) << 8) | buffer[11];
-
-       for (uint16_t i = 12; i < descriptorsLoopLength + 12; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-}
-
-uint16_t Event::getEventId(void) const
-{
-       return eventId;
-}
-
-uint16_t Event::getStartTimeMjd(void) const
-{
-       return startTimeMjd;
-}
-
-uint32_t Event::getStartTimeBcd(void) const
-{
-       return startTimeBcd;
-}
-
-uint32_t Event::getDuration(void) const
-{
-       return duration;
-}
-
-uint8_t Event::getRunningStatus(void) const
-{
-       return runningStatus;
-}
-
-uint8_t Event::getFreeCaMode(void) const
-{
-       return freeCaMode;
-}
-
-EventInformationTable::EventInformationTable(const uint8_t * const buffer) : LongCrcTable(buffer)
-{
-       transportStreamId = (buffer[8] << 8) | buffer[9];
-       originalNetworkId = (buffer[10] << 8) | buffer[11];
-       segmentLastSectionNumber = buffer[12];
-       lastTableId = buffer[13];
-
-       for (uint16_t i = 14; i < sectionLength - 1; i += (((buffer[i + 10] & 0x0f) << 8) | buffer[i + 11]) + 12)
-               events.push_back(new Event(&buffer[i]));
-}
-
-EventInformationTable::~EventInformationTable(void)
-{
-       for (EventIterator i = events.begin(); i != events.end(); ++i)
-               delete *i;
-}
-
-uint16_t EventInformationTable::getTransportStreamId(void) const
-{
-       return transportStreamId;
-}
-
-uint16_t EventInformationTable::getOriginalNetworkId(void) const
-{
-       return originalNetworkId;
-}
-
-uint8_t EventInformationTable::getLastSectionNumber(void) const
-{
-       return lastSectionNumber;
-}
-
-uint8_t EventInformationTable::getLastTableId(void) const
-{
-       return lastTableId;
-}
-
-const EventVector *EventInformationTable::getEvents(void) const
-{
-       return &events;
-}
-
diff --git a/lib/dvb_si/eit.h b/lib/dvb_si/eit.h
deleted file mode 100644 (file)
index 1b278ca..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * $Id: eit.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_eit_h__
-#define __dvb_table_eit_h__
-
-#include <lib/dvb_si/container.h>
-#include "long_crc_table.h"
-
-class Event : public DescriptorContainer
-{
-       protected:
-               unsigned eventId                                : 16;
-               unsigned startTimeMjd                           : 16;
-               unsigned startTimeBcd                           : 24;
-               unsigned duration                               : 24;
-               unsigned runningStatus                          : 3;
-               unsigned freeCaMode                             : 1;
-               unsigned descriptorsLoopLength                  : 12;
-
-       public:
-               Event(const uint8_t * const buffer);
-
-               uint16_t getEventId(void) const;
-               uint16_t getStartTimeMjd(void) const;
-               uint32_t getStartTimeBcd(void) const;
-               uint32_t getDuration(void) const;
-               uint8_t getRunningStatus(void) const;
-               uint8_t getFreeCaMode(void) const;
-};
-
-typedef std::vector<Event *> EventVector;
-typedef EventVector::iterator EventIterator;
-typedef EventVector::const_iterator EventConstIterator;
-
-class EventInformationTable : public LongCrcTable
-{
-       protected:
-               unsigned transportStreamId                      : 16;
-               unsigned originalNetworkId                      : 16;
-               unsigned segmentLastSectionNumber               : 8;
-               unsigned lastTableId                            : 8;
-               EventVector events;
-
-       public:
-               EventInformationTable(const uint8_t * const buffer);
-               ~EventInformationTable(void);
-
-               static const uint16_t LENGTH = 4096;
-               static const enum PacketId PID = PID_EIT;
-               static const enum TableId TID = TID_EIT_ACTUAL;
-               static const uint32_t TIMEOUT = 3000;
-
-               uint16_t getTransportStreamId(void) const;
-               uint16_t getOriginalNetworkId(void) const;
-               uint8_t getLastSectionNumber(void) const;
-               uint8_t getLastTableId(void) const;
-               const EventVector *getEvents(void) const;
-};
-
-typedef std::vector<EventInformationTable *> EventInformationTableVector;
-typedef EventInformationTableVector::iterator EventInformationTableIterator;
-typedef EventInformationTableVector::const_iterator EventInformationTableConstIterator;
-
-#endif /* __dvb_table_eit_h__ */
diff --git a/lib/dvb_si/element_descriptor.h b/lib/dvb_si/element_descriptor.h
deleted file mode 100644 (file)
index 3587569..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * $Id: element_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_element_descriptor_h__
-#define __dvb_descriptor_element_descriptor_h__
-
-#include "descriptor.h"
-
-/* 0x92 */
-class ElementDescriptor : public Descriptor
-{
-       public:
-               ElementDescriptor(const uint8_t * const buffer);
-};
-
-#endif /* __dvb_descriptor_element_descriptor_h__ */
diff --git a/lib/dvb_si/extended_event_descriptor.cpp b/lib/dvb_si/extended_event_descriptor.cpp
deleted file mode 100644 (file)
index 11b639a..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * $Id: extended_event_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/extended_event_descriptor.h>
-
-ExtendedEvent::ExtendedEvent(const uint8_t * const buffer)
-{
-       itemDescriptionLength = buffer[0];
-       itemDescription.assign((char *)&buffer[1], itemDescriptionLength);
-       itemLength = buffer[itemDescriptionLength + 1];
-       item.assign((char *)&buffer[itemDescriptionLength + 2], itemLength);
-}
-
-std::string ExtendedEvent::getItemDescription(void) const
-{
-       return itemDescription;
-}
-
-std::string ExtendedEvent::getItem(void) const
-{
-       return item;
-}
-
-ExtendedEventDescriptor::ExtendedEventDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       descriptorNumber = (buffer[2] >> 4) & 0x0f;
-       lastDescriptorNumber = buffer[2] & 0x0f;
-       iso639LanguageCode.assign((char *)&buffer[3], 3);
-       lengthOfItems = buffer[6];
-
-       ExtendedEvent *e;
-
-       for (uint16_t i = 0; i < lengthOfItems; i += e->itemDescriptionLength + e->itemLength + 2) {
-               e = new ExtendedEvent(&buffer[i + 7]);
-               items.push_back(e);
-       }
-
-       textLength = buffer[lengthOfItems + 7];
-       text.assign((char *)&buffer[lengthOfItems + 8], textLength);
-}
-
-ExtendedEventDescriptor::~ExtendedEventDescriptor(void)
-{
-       for (ExtendedEventIterator i = items.begin(); i != items.end(); ++i)
-               delete *i;
-}
-
-uint8_t ExtendedEventDescriptor::getDescriptorNumber(void) const
-{
-       return descriptorNumber;
-}
-
-uint8_t ExtendedEventDescriptor::getLastDescriptorNumber(void) const
-{
-       return lastDescriptorNumber;
-}
-
-std::string ExtendedEventDescriptor::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-const ExtendedEventVector *ExtendedEventDescriptor::getItems(void) const
-{
-       return &items;
-}
-
-std::string ExtendedEventDescriptor::getText(void) const
-{
-       return text;
-}
-
diff --git a/lib/dvb_si/extended_event_descriptor.h b/lib/dvb_si/extended_event_descriptor.h
deleted file mode 100644 (file)
index 9b170d0..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * $Id: extended_event_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_extended_event_descriptor_h__
-#define __dvb_descriptor_extended_event_descriptor_h__
-
-#include "descriptor.h"
-
-class ExtendedEvent
-{
-       protected:
-               unsigned itemDescriptionLength                  : 8;
-               std::string itemDescription;
-               unsigned itemLength                             : 8;
-               std::string item;
-
-       public:
-               ExtendedEvent(const uint8_t * const buffer);
-
-               std::string getItemDescription(void) const;
-               std::string getItem(void) const;
-
-       friend class ExtendedEventDescriptor;
-};
-
-typedef std::vector<ExtendedEvent *> ExtendedEventVector;
-typedef ExtendedEventVector::iterator ExtendedEventIterator;
-typedef ExtendedEventVector::const_iterator ExtendedEventConstIterator;
-
-class ExtendedEventDescriptor : public Descriptor
-{
-       protected:
-               unsigned descriptorNumber                       : 4;
-               unsigned lastDescriptorNumber                   : 4;
-               std::string iso639LanguageCode;
-               unsigned lengthOfItems                          : 8;
-               ExtendedEventVector items;
-               unsigned textLength                             : 8;
-               std::string text;
-
-       public:
-               ExtendedEventDescriptor(const uint8_t * const buffer);
-               ~ExtendedEventDescriptor(void);
-
-               uint8_t getDescriptorNumber(void) const;
-               uint8_t getLastDescriptorNumber(void) const;
-               std::string getIso639LanguageCode(void) const;
-               const ExtendedEventVector *getItems(void) const;
-               std::string getText(void) const;
-};
-
-#endif /* __dvb_descriptor_extended_event_descriptor_h__ */
diff --git a/lib/dvb_si/frequency_list_descriptor.cpp b/lib/dvb_si/frequency_list_descriptor.cpp
deleted file mode 100644 (file)
index fe6ea32..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: frequency_list_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/frequency_list_descriptor.h>
-
-FrequencyListDescriptor::FrequencyListDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       if (descriptorLength < 1)
-               return;
-       reserved = (buffer[2] >> 2) & 0x3f;
-       codingType = buffer[2] & 0x03;
-
-       for (uint16_t i = 0; i < descriptorLength - 1; i += 4)
-               centreFrequencies.push_back((buffer[i + 3] << 24) | (buffer[i + 4] << 16) | (buffer[i + 5] << 8) | buffer[i + 6]);
-}
-
-uint8_t FrequencyListDescriptor::getCodingType(void) const
-{
-       return codingType;
-}
-
-const CentreFrequencyVector *FrequencyListDescriptor::getCentreFrequencies(void) const
-{
-       return &centreFrequencies;
-}
-
diff --git a/lib/dvb_si/frequency_list_descriptor.h b/lib/dvb_si/frequency_list_descriptor.h
deleted file mode 100644 (file)
index 83fdf92..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * $Id: frequency_list_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_frequency_list_descriptor_h__
-#define __dvb_descriptor_frequency_list_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint32_t> CentreFrequencyVector;
-typedef CentreFrequencyVector::iterator CentreFrequencyIterator;
-typedef CentreFrequencyVector::const_iterator CentreFrequencyConstIterator;
-
-class FrequencyListDescriptor : public Descriptor
-{
-       protected:
-               unsigned reserved                               : 6;
-               unsigned codingType                             : 2;
-               CentreFrequencyVector centreFrequencies;
-
-       public:
-               FrequencyListDescriptor(const uint8_t * const buffer);
-
-               uint8_t getCodingType(void) const;
-               const CentreFrequencyVector *getCentreFrequencies(void) const;
-};
-
-#endif /* __dvb_descriptor_frequency_list_descriptor_h__ */
diff --git a/lib/dvb_si/group_descriptor.h b/lib/dvb_si/group_descriptor.h
deleted file mode 100644 (file)
index fd3292d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * $Id: group_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_group_descriptor_h__
-#define __dvb_descriptor_group_descriptor_h__
-
-#include "descriptor.h"
-
-/* 0x91 */
-class GroupDescriptor : public Descriptor
-{
-       public:
-               GroupDescriptor(const uint8_t * const buffer);
-};
-
-#endif /* __dvb_descriptor_group_descriptor_h__ */
diff --git a/lib/dvb_si/hierarchy_descriptor.h b/lib/dvb_si/hierarchy_descriptor.h
deleted file mode 100644 (file)
index 3c990fc..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * $Id: hierarchy_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_hierarchy_descriptor_h__
-#define __dvb_descriptor_hierarchy_descriptor_h__
-
-#include "descriptor.h"
-
-class HierarchyDescriptor : public Descriptor
-{
-       protected:
-               unsigned reserved                               : 4;
-               unsigned hierarchyType                          : 4;
-               unsigned reserved2                              : 2;
-               unsigned hierarchyLayerIndex                    : 6;
-               unsigned reserved3                              : 2;
-               unsigned hierarchyEmbeddedLayerIndex            : 6;
-               unsigned reserved4                              : 2;
-               unsigned hierarchyChannel                       : 6;
-
-       private:
-               HierarchyDescriptor(const uint8_t * const buffer);
-
-               uint8_t getHierarchyType(void) const;
-               uint8_t getHierarchyLayerIndex(void) const;
-               uint8_t getHierarchyEmbeddedLayerIndex(void) const;
-               uint8_t getHierarchyChannel(void) const;
-};
-
-#endif /* __dvb_descriptor_hierarchy_descriptor_h__ */
diff --git a/lib/dvb_si/ibp_descriptor.h b/lib/dvb_si/ibp_descriptor.h
deleted file mode 100644 (file)
index d601fe4..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * $Id: ibp_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ibp_descriptor_h__
-#define __dvb_descriptor_ibp_descriptor_h__
-
-#include "descriptor.h"
-
-class IbpDescriptor : public Descriptor
-{
-       protected:
-               unsigned closedGopFlag                          : 1;
-               unsigned identicalGopFlag                       : 1;
-               unsigned maxGopLength                           : 14;
-
-       public:
-               IbpDescriptor(const uint8_t * const buffer);
-
-               uint8_t getClosedGopFlag(void) const;
-               uint8_t getIdenticalGopFlag(void) const;
-               uint16_t getMaxGopLength(void) const;
-};
-
-#endif /* __dvb_descriptor_ibp_descriptor_h__ */
diff --git a/lib/dvb_si/ippv_booking_descriptor.h b/lib/dvb_si/ippv_booking_descriptor.h
deleted file mode 100644 (file)
index 950bb45..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * $Id: ippv_booking_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ippv_booking_descriptor_h__
-#define __dvb_descriptor_ippv_booking_descriptor_h__
-
-#include "descriptor.h"
-
-/* 0x81 */
-class IppvBookingDescriptor : public Descriptor
-{
-       public:
-               IppvBookingDescriptor(const uint8_t * const buffer);
-};
-
-#endif /* __dvb_descriptor_ippv_booking_descriptor_h__ */
diff --git a/lib/dvb_si/ippv_descriptor.h b/lib/dvb_si/ippv_descriptor.h
deleted file mode 100644 (file)
index 967c9b5..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * $Id: ippv_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_ippv_descriptor_h__
-#define __dvb_descriptor_ippv_descriptor_h__
-
-#include "descriptor.h"
-
-/* 0xF0 */
-class CurrencyEntry
-{
-       public:
-               CurrencyEntry(const uint8_t * const buffer);
-};
-
-class CountryEntry
-{
-       protected:
-               unsigned country                                : 24;
-               unsigned unknown                                : 5;
-               unsigned currencyAndCostDetail                  : 3;
-               // if (currencyAndCostDetail & 1)
-               unsigned bcdCost                                : 32;
-               unsigned length                                 : 8;
-               std::vector<CurrencyEntry *> currency;
-
-       public:
-               CountryEntry(const uint8_t * const buffer);
-};
-
-class IppvDescriptor : public Descriptor
-{
-       protected:
-               unsigned unknown1                               : 16;
-               unsigned unknown2                               : 16;
-               unsigned unknown3                               : 16;
-               unsigned IppvEventId                            : 16;
-               std::vector<CountryEntry *> country;
-
-       private:
-               IppvDescriptor(const uint8_t * const buffer);
-};
-
-#endif /* __dvb_descriptor_ippv_descriptor_h__ */
diff --git a/lib/dvb_si/iso639_language_descriptor.cpp b/lib/dvb_si/iso639_language_descriptor.cpp
deleted file mode 100644 (file)
index 26ca1e0..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * $Id: iso639_language_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/iso639_language_descriptor.h>
-
-Iso639Language::Iso639Language(const uint8_t * const buffer)
-{
-       iso639LanguageCode.assign((char *)&buffer[0], 3);
-       audioType = buffer[3];
-}
-
-std::string Iso639Language::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-uint8_t Iso639Language::getAudioType(void) const
-{
-       return audioType;
-}
-
-Iso639LanguageDescriptor::Iso639LanguageDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += 4)
-               iso639Languages.push_back(new Iso639Language(&buffer[i + 2]));
-}
-
-Iso639LanguageDescriptor::~Iso639LanguageDescriptor(void)
-{
-       for (Iso639LanguageIterator i = iso639Languages.begin(); i != iso639Languages.end(); ++i)
-               delete *i;
-}
-
-const Iso639LanguageVector *Iso639LanguageDescriptor::getIso639Languages(void) const
-{
-       return &iso639Languages;
-}
-
diff --git a/lib/dvb_si/iso639_language_descriptor.h b/lib/dvb_si/iso639_language_descriptor.h
deleted file mode 100644 (file)
index 8983639..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * $Id: iso639_language_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_iso639_language_descriptor_h__
-#define __dvb_descriptor_iso639_language_descriptor_h__
-
-#include "descriptor.h"
-
-class Iso639Language
-{
-       protected:
-               std::string iso639LanguageCode;
-               unsigned audioType                              : 8;
-
-       public:
-               Iso639Language(const uint8_t * const buffer);
-
-               std::string getIso639LanguageCode(void) const;
-               uint8_t getAudioType(void) const;
-};
-
-typedef std::vector<Iso639Language *> Iso639LanguageVector;
-typedef Iso639LanguageVector::iterator Iso639LanguageIterator;
-typedef Iso639LanguageVector::const_iterator Iso639LanguageConstIterator;
-
-class Iso639LanguageDescriptor : public Descriptor
-{
-       protected:
-               Iso639LanguageVector iso639Languages;
-
-       public:
-               Iso639LanguageDescriptor(const uint8_t * const buffer);
-               ~Iso639LanguageDescriptor(void);
-
-               const Iso639LanguageVector *getIso639Languages(void) const;
-};
-
-#endif /* __dvb_descriptor_iso639_language_descriptor_h__ */
diff --git a/lib/dvb_si/linkage_descriptor.cpp b/lib/dvb_si/linkage_descriptor.cpp
deleted file mode 100644 (file)
index 77b991e..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * $Id: linkage_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/linkage_descriptor.h>
-
-LinkageDescriptor::LinkageDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       transportStreamId = (buffer[2] << 8) | buffer[3];
-       originalNetworkId = (buffer[4] << 8) | buffer[5];
-       serviceId = (buffer[6] << 8) | buffer[7];
-       linkageType = buffer[8];
-
-       if (linkageType != 0x08)
-       {
-               if (descriptorLength < 7)
-                       return;
-
-               for (uint16_t i = 0; i < descriptorLength - 7; ++i)
-                       privateDataBytes.push_back(buffer[i + 9]);
-       }
-
-       else {
-               handOverType = (buffer[9] >> 4) & 0x0f;
-               reserved = (buffer[9] >> 1) & 0x07;
-               originType = buffer[9] & 0x01;
-
-               uint8_t offset = 0;
-
-               if ((handOverType >= 0x01) && (handOverType <= 0x03)) {
-                       networkId = (buffer[10] << 8) | buffer[11];
-                       offset += 2;
-               }
-
-               if (originType == 0x00) {
-                       initialServiceId = (buffer[offset + 10] << 8) | buffer[offset + 11];
-                       offset += 2;
-               }
-               
-               if (descriptorLength >= (unsigned)(offset+8))
-                       for (uint16_t i = 0; i < descriptorLength - (offset + 8); ++i)
-                               privateDataBytes.push_back(buffer[i + offset + 10]);
-       }
-}
-
-uint16_t LinkageDescriptor::getTransportStreamId(void) const
-{
-       return transportStreamId;
-}
-
-uint16_t LinkageDescriptor::getOriginalNetworkId(void) const
-{
-       return originalNetworkId;
-}
-
-uint16_t LinkageDescriptor::getServiceId(void) const
-{
-       return serviceId;
-}
-
-uint8_t LinkageDescriptor::getLinkageType(void) const
-{
-       return linkageType;
-}
-
-const PrivateDataByteVector *LinkageDescriptor::getPrivateDataBytes(void) const
-{
-       return &privateDataBytes;
-}
-
-uint8_t LinkageDescriptor::getHandOverType(void) const
-{
-       return handOverType;
-}
-
-uint8_t LinkageDescriptor::getOriginType(void) const
-{
-       return originType;
-}
-
-uint16_t LinkageDescriptor::getNetworkId(void) const
-{
-       return networkId;
-}
-
-uint16_t LinkageDescriptor::getInitialServiceId(void) const
-{
-       return initialServiceId;
-}
-
diff --git a/lib/dvb_si/linkage_descriptor.h b/lib/dvb_si/linkage_descriptor.h
deleted file mode 100644 (file)
index cfecf50..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $Id: linkage_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_linkage_descriptor_h__
-#define __dvb_descriptor_linkage_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> PrivateDataByteVector;
-typedef PrivateDataByteVector::iterator PrivateDataByteIterator;
-typedef PrivateDataByteVector::const_iterator PrivateDataByteConstIterator;
-
-class LinkageDescriptor : public Descriptor
-{
-       protected:
-               unsigned transportStreamId                      : 16;
-               unsigned originalNetworkId                      : 16;
-               unsigned serviceId                              : 16;
-               unsigned linkageType                            : 8;
-               PrivateDataByteVector privateDataBytes;
-               unsigned handOverType                           : 4;
-               unsigned reserved                               : 3;
-               unsigned originType                             : 1;
-               unsigned networkId                              : 16;
-               unsigned initialServiceId                       : 16;
-
-       public:
-               LinkageDescriptor(const uint8_t * const buffer);
-
-               uint16_t getTransportStreamId(void) const;
-               uint16_t getOriginalNetworkId(void) const;
-               uint16_t getServiceId(void) const;
-               uint8_t getLinkageType(void) const;
-               const PrivateDataByteVector *getPrivateDataBytes(void) const;
-               uint8_t getHandOverType(void) const;
-               uint8_t getOriginType(void) const;
-               uint16_t getNetworkId(void) const;
-               uint16_t getInitialServiceId(void) const;
-};
-
-#endif /* __dvb_descriptor_linkage_descriptor_h__ */
diff --git a/lib/dvb_si/local_time_offset_descriptor.cpp b/lib/dvb_si/local_time_offset_descriptor.cpp
deleted file mode 100644 (file)
index 72fc53b..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * $Id: local_time_offset_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/local_time_offset_descriptor.h>
-
-LocalTimeOffset::LocalTimeOffset(const uint8_t * const buffer)
-{
-       countryCode.assign((char *)&buffer[0], 3);
-       countryRegionId = (buffer[3] >> 2) & 0x3f;
-       reserved = (buffer[3] >> 1) & 0x01;
-       localTimeOffsetPolarity = buffer[3] & 0x01;
-       localTimeOffset = (buffer[4] << 8) | buffer[5];
-       timeOfChangeMjd = (buffer[6] << 8) | buffer[7];
-       timeOfChangeBcd = (buffer[8] << 16) | (buffer[9] << 8) | buffer[10];
-       nextTimeOffset = (buffer[11] << 8) | buffer[12];
-}
-
-std::string LocalTimeOffset::getCountryCode(void) const
-{
-       return countryCode;
-}
-
-uint8_t LocalTimeOffset::getCountryRegionId(void) const
-{
-       return countryRegionId;
-}
-
-uint8_t LocalTimeOffset::getLocalTimeOffsetPolarity(void) const
-{
-       return localTimeOffsetPolarity;
-}
-
-uint16_t LocalTimeOffset::getLocalTimeOffset(void) const
-{
-       return localTimeOffset;
-}
-
-uint16_t LocalTimeOffset::getTimeOfChangeMjd(void) const
-{
-       return timeOfChangeMjd;
-}
-
-uint32_t LocalTimeOffset::getTimeOfChangeBcd(void) const
-{
-       return timeOfChangeBcd;
-}
-
-uint16_t LocalTimeOffset::getNextTimeOffset(void) const
-{
-       return nextTimeOffset;
-}
-
-LocalTimeOffsetDescriptor::LocalTimeOffsetDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += 13)
-               localTimeOffsets.push_back(new LocalTimeOffset(&buffer[i + 2]));
-}
-
-
-LocalTimeOffsetDescriptor::~LocalTimeOffsetDescriptor(void)
-{
-       for (LocalTimeOffsetIterator i = localTimeOffsets.begin(); i != localTimeOffsets.end(); ++i)
-               delete *i;
-}
-
-const LocalTimeOffsetVector *LocalTimeOffsetDescriptor::getLocalTimeOffsets(void) const
-{
-       return &localTimeOffsets;
-}
-
diff --git a/lib/dvb_si/local_time_offset_descriptor.h b/lib/dvb_si/local_time_offset_descriptor.h
deleted file mode 100644 (file)
index 85373f7..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * $Id: local_time_offset_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_local_time_offset_descriptor_h__
-#define __dvb_descriptor_local_time_offset_descriptor_h__
-
-#include "descriptor.h"
-
-class LocalTimeOffset
-{
-       protected:
-               std::string countryCode;
-               unsigned countryRegionId                        : 6;
-               unsigned reserved                               : 1;
-               unsigned localTimeOffsetPolarity                : 1;
-               unsigned localTimeOffset                        : 16;
-               unsigned timeOfChangeMjd                        : 16;
-               unsigned timeOfChangeBcd                        : 24;
-               unsigned nextTimeOffset                         : 16;
-
-       public:
-               LocalTimeOffset(const uint8_t * const buffer);
-
-               std::string getCountryCode(void) const;
-               uint8_t getCountryRegionId(void) const;
-               uint8_t getLocalTimeOffsetPolarity(void) const;
-               uint16_t getLocalTimeOffset(void) const;
-               uint16_t getTimeOfChangeMjd(void) const;
-               uint32_t getTimeOfChangeBcd(void) const;
-               uint16_t getNextTimeOffset(void) const;
-};
-
-typedef std::vector<LocalTimeOffset *> LocalTimeOffsetVector;
-typedef LocalTimeOffsetVector::iterator LocalTimeOffsetIterator;
-typedef LocalTimeOffsetVector::const_iterator LocalTimeOffsetConstIterator;
-
-class LocalTimeOffsetDescriptor : public Descriptor
-{
-       protected:
-               LocalTimeOffsetVector localTimeOffsets;
-
-       public:
-               LocalTimeOffsetDescriptor(const uint8_t * const buffer);
-               ~LocalTimeOffsetDescriptor(void);
-
-               const LocalTimeOffsetVector *getLocalTimeOffsets(void) const;
-};
-
-#endif /* __dvb_descriptor_local_time_offset_descriptor_h__ */
diff --git a/lib/dvb_si/long_crc_table.cpp b/lib/dvb_si/long_crc_table.cpp
deleted file mode 100644 (file)
index 2f91652..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * $Id: long_crc_table.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/long_crc_table.h>
-
-LongCrcTable::LongCrcTable(const uint8_t * const buffer) : LongTable(buffer)
-{
-       crc32 = (buffer[sectionLength - 1] << 24) |
-               (buffer[sectionLength + 0] << 16) |
-               (buffer[sectionLength + 1] << 8) |
-               (buffer[sectionLength + 2]);
-}
-
-uint32_t LongCrcTable::getCrc32(void) const
-{
-       return crc32;
-}
-
diff --git a/lib/dvb_si/long_crc_table.h b/lib/dvb_si/long_crc_table.h
deleted file mode 100644 (file)
index 14f4ded..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: long_crc_table.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_long_crc_table_h__
-#define __dvb_table_long_crc_table_h__
-
-#include "long_table.h"
-
-class LongCrcTable : public LongTable
-{
-       protected:
-               unsigned crc32                                  : 32;
-
-       public:
-               LongCrcTable(const uint8_t * const buffer);
-
-               static const uint8_t CRC32 = 1;
-
-               uint32_t getCrc32(void) const;
-};
-
-typedef std::vector<LongCrcTable *> LongCrcTableVector;
-typedef LongCrcTableVector::iterator LongCrcTableIterator;
-typedef LongCrcTableVector::const_iterator LongCrcTableConstIterator;
-
-#endif /* __dvb_table_long_crc_table_h__ */
diff --git a/lib/dvb_si/long_table.cpp b/lib/dvb_si/long_table.cpp
deleted file mode 100644 (file)
index f6bcbdf..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * $Id: long_table.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/long_table.h>
-
-LongTable::LongTable(const uint8_t * const buffer) : ShortTable(buffer)
-{
-       tableIdExtension = (buffer[3] << 8) | buffer[4];
-       reserved3 = (buffer[5] >> 6) & 0x03;
-       versionNumber = (buffer[5] >> 1) & 0x1F;
-       currentNextIndicator = buffer[5] & 0x01;
-       sectionNumber = buffer[6];
-       lastSectionNumber = buffer[7];
-}
-
-uint16_t LongTable::getTableIdExtension(void) const
-{
-       return tableIdExtension;
-}
-
-uint8_t LongTable::getVersionNumber(void) const
-{
-       return versionNumber;
-}
-
-uint8_t LongTable::getCurrentNextIndicator(void) const
-{
-       return currentNextIndicator;
-}
-
-uint8_t LongTable::getSectionNumber(void) const
-{
-       return sectionNumber;
-}
-
-uint8_t LongTable::getLastSectionNumber(void) const
-{
-       return lastSectionNumber;
-}
-
-bool LongTable::operator< (const LongTable &t) const
-{
-       return (sectionNumber < t.sectionNumber);
-}
-
-bool LongTable::operator> (const LongTable &t) const
-{
-       return (sectionNumber > t.sectionNumber);
-}
-
-bool LongTable::operator<= (const LongTable &t) const
-{
-       return (sectionNumber <= t.sectionNumber);
-}
-
-bool LongTable::operator>= (const LongTable &t) const
-{
-       return (sectionNumber >= t.sectionNumber);
-}
-
-bool LongTable::operator== (const LongTable &t) const
-{
-       return (sectionNumber == t.sectionNumber);
-}
-
-bool LongTable::operator!= (const LongTable &t) const
-{
-       return (sectionNumber != t.sectionNumber);
-}
-
diff --git a/lib/dvb_si/long_table.h b/lib/dvb_si/long_table.h
deleted file mode 100644 (file)
index 31341d4..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * $Id: long_table.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_long_table_h__
-#define __dvb_table_long_table_h__
-
-#include "short_table.h"
-
-class LongTable : public ShortTable
-{
-       protected:
-               unsigned tableIdExtension                       : 16;
-               unsigned reserved3                              : 2;
-               unsigned versionNumber                          : 5;
-               unsigned currentNextIndicator                   : 1;
-               unsigned sectionNumber                          : 8;
-               unsigned lastSectionNumber                      : 8;
-
-       public:
-               LongTable(const uint8_t * const buffer);
-
-               static const uint8_t SYNTAX = 1;
-
-               uint16_t getTableIdExtension(void) const;
-               uint8_t getVersionNumber(void) const;
-               uint8_t getCurrentNextIndicator(void) const;
-               uint8_t getSectionNumber(void) const;
-               uint8_t getLastSectionNumber(void) const;
-
-               bool operator< (const LongTable &t) const;
-               bool operator> (const LongTable &t) const;
-               bool operator<= (const LongTable &t) const;
-               bool operator>= (const LongTable &t) const;
-               bool operator== (const LongTable &t) const;
-               bool operator!= (const LongTable &t) const;
-};
-
-typedef std::vector<LongTable *> LongTableVector;
-typedef LongTableVector::iterator LongTableIterator;
-typedef LongTableVector::const_iterator LongTableConstIterator;
-
-#endif /* __dvb_table_long_table_h__ */
diff --git a/lib/dvb_si/maximum_bitrate_descriptor.h b/lib/dvb_si/maximum_bitrate_descriptor.h
deleted file mode 100644 (file)
index 54ed29c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $Id: maximum_bitrate_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_maximum_bitrate_descriptor_h__
-#define __dvb_descriptor_maximum_bitrate_descriptor_h__
-
-#include "descriptor.h"
-
-class MaximumBitrateDescriptor : public Descriptor
-{
-       protected:
-               unsigned reserved                               : 2;
-               unsigned maximumBitrate                         : 22;
-
-       public:
-               MaximumBitrateDescriptor(const uint8_t * const buffer);
-
-               uint32_t getMaximumBitrate(void) const;
-};
-
-#endif /* __dvb_descriptor_maximum_bitrate_descriptor_h__ */
diff --git a/lib/dvb_si/mosaic_descriptor.cpp b/lib/dvb_si/mosaic_descriptor.cpp
deleted file mode 100644 (file)
index f13bccf..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * $Id: mosaic_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/mosaic_descriptor.h>
-
-ElementaryCellField::ElementaryCellField (const uint8_t * const buffer)
-{
-       reserved = (buffer[0] >> 6) & 0x03;
-       elementaryCellId = buffer[0] & 0x3F;
-}
-
-uint8_t ElementaryCellField::getElementaryCellId(void) const
-{
-       return elementaryCellId;
-}
-
-MosaicCell::MosaicCell (const uint8_t * const buffer)
-{
-       logicalCellId = (buffer[0] >> 2) & 0x3F;
-       reserved = (((buffer[0] & 0x03) << 8) | (buffer[1] & 0xF1)) >> 3;
-       logicalCellPresentationInfo = buffer[1] & 0x07;
-       elementaryCellFieldLength = buffer[2];
-
-       for (uint16_t i = 0; i < elementaryCellFieldLength; ++i)
-               elementaryCellFields.push_back(new ElementaryCellField(&buffer[i + 3]));
-
-       cellLinkageInfo = buffer[elementaryCellFieldLength + 3];
-
-       switch (cellLinkageInfo) {
-       case 0x01:
-               bouquetId = (buffer[elementaryCellFieldLength + 4] << 8) | buffer[elementaryCellFieldLength + 5];
-               break;
-       case 0x02:
-       case 0x03:
-       case 0x04:
-               originalNetworkId = (buffer[elementaryCellFieldLength + 4] << 8) | buffer[elementaryCellFieldLength + 5];
-               transportStreamId = (buffer[elementaryCellFieldLength + 6] << 8) | buffer[elementaryCellFieldLength + 7];
-               serviceId = (buffer[elementaryCellFieldLength + 8] << 8) | buffer[elementaryCellFieldLength + 9];
-               break;
-       default:
-               break;
-       }
-
-       if (cellLinkageInfo == 0x04)
-               eventId = (buffer[elementaryCellFieldLength + 10] << 8) | buffer[elementaryCellFieldLength + 11];
-}
-
-MosaicCell::~MosaicCell(void)
-{
-       for (ElementaryCellFieldIterator i = elementaryCellFields.begin(); i != elementaryCellFields.end(); ++i)
-               delete *i;
-}
-
-uint8_t MosaicCell::getLogicalCellId(void) const
-{
-       return logicalCellId;
-}
-
-uint8_t MosaicCell::getLogicalCellPresentationInfo(void) const
-{
-       return logicalCellPresentationInfo;
-}
-
-const ElementaryCellFieldVector *MosaicCell::getElementaryCellFields(void) const
-{
-       return &elementaryCellFields;
-}
-
-uint8_t MosaicCell::getCellLinkageInfo(void) const
-{
-       return cellLinkageInfo;
-}
-
-uint16_t MosaicCell::getBouquetId(void) const
-{
-       return bouquetId;
-}
-
-uint16_t MosaicCell::getOriginalNetworkId(void) const
-{
-       return originalNetworkId;
-}
-
-uint16_t MosaicCell::getTransportStreamId(void) const
-{
-       return transportStreamId;
-}
-
-uint16_t MosaicCell::getServiceId(void) const
-{
-       return serviceId;
-}
-
-uint16_t MosaicCell::getEventId(void) const
-{
-       return eventId;
-}
-
-MosaicDescriptor::MosaicDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       if (descriptorLength < 1)
-               return;
-       
-       mosaicEntryPoint = (buffer[2] >> 7) & 0x01;
-       numberOfHorizontalElementaryCells = (buffer[2] >> 4) & 0x07;
-       reserved = (buffer[2] >> 3) & 0x01;
-       numberOfVerticalElementaryCells = buffer[2] & 0x07;
-
-       for (uint16_t i = 0; i < descriptorLength - 1; i += buffer[i + 6] + 2) {
-               mosaicCells.push_back(new MosaicCell(&buffer[i + 1]));
-               switch (buffer[i + 6 + buffer[i + 6] + 1]) {
-               case 0x01:
-                       i += 2;
-                       break;
-               case 0x02:
-               case 0x03:
-                       i += 6;
-                       break;
-               case 0x04:
-                       i += 8;
-                       break;
-               default:
-                       break;
-               }
-       }
-}
-
-MosaicDescriptor::~MosaicDescriptor(void)
-{
-       for (MosaicCellIterator i = mosaicCells.begin(); i != mosaicCells.end(); ++i)
-               delete *i;
-}
-
-uint8_t MosaicDescriptor::getMosaicEntryPoint(void) const
-{
-       return mosaicEntryPoint;
-}
-
-uint8_t MosaicDescriptor::getNumberOfHorizontalElementaryCells(void) const
-{
-       return numberOfHorizontalElementaryCells;
-}
-
-uint8_t MosaicDescriptor::getNumberOfVerticalElementaryCells(void) const
-{
-       return numberOfVerticalElementaryCells;
-}
-
-const MosaicCellVector *MosaicDescriptor::getMosaicCells(void) const
-{
-       return &mosaicCells;
-}
-                                                               
diff --git a/lib/dvb_si/mosaic_descriptor.h b/lib/dvb_si/mosaic_descriptor.h
deleted file mode 100644 (file)
index e9f112e..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * $Id: mosaic_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_mosaic_descriptor_h__
-#define __dvb_descriptor_mosaic_descriptor_h__
-
-#include "descriptor.h"
-
-class ElementaryCellField
-{
-       protected:
-               unsigned reserved                               : 2;
-               unsigned elementaryCellId                       : 6;
-
-       public:
-               ElementaryCellField(const uint8_t * const buffer);
-
-               uint8_t getElementaryCellId(void) const;
-};
-
-typedef std::vector<ElementaryCellField *> ElementaryCellFieldVector;
-typedef ElementaryCellFieldVector::iterator ElementaryCellFieldIterator;
-typedef ElementaryCellFieldVector::const_iterator ElementaryCellFieldConstIterator;
-
-class MosaicCell
-{
-       protected:
-               unsigned logicalCellId                          : 6;
-               unsigned reserved                               : 7;
-               unsigned logicalCellPresentationInfo            : 3;
-               unsigned elementaryCellFieldLength              : 8;
-               ElementaryCellFieldVector elementaryCellFields;
-               unsigned cellLinkageInfo                        : 8;
-               unsigned bouquetId                              : 16;
-               unsigned originalNetworkId                      : 16;
-               unsigned transportStreamId                      : 16;
-               unsigned serviceId                              : 16;
-               unsigned eventId                                : 16;
-
-       public:
-               MosaicCell(const uint8_t * const buffer);
-               ~MosaicCell(void);
-
-               uint8_t getLogicalCellId(void) const;
-               uint8_t getLogicalCellPresentationInfo(void) const;
-               const ElementaryCellFieldVector *getElementaryCellFields(void) const;
-               uint8_t getCellLinkageInfo(void) const;
-               uint16_t getBouquetId(void) const;
-               uint16_t getOriginalNetworkId(void) const;
-               uint16_t getTransportStreamId(void) const;
-               uint16_t getServiceId(void) const;
-               uint16_t getEventId(void) const;
-};
-
-typedef std::vector<MosaicCell *> MosaicCellVector;
-typedef MosaicCellVector::iterator MosaicCellIterator;
-typedef MosaicCellVector::const_iterator MosaicCellConstIterator;
-
-class MosaicDescriptor : public Descriptor
-{
-       protected:
-               unsigned mosaicEntryPoint                       : 1;
-               unsigned numberOfHorizontalElementaryCells      : 3;
-               unsigned reserved                               : 1;
-               unsigned numberOfVerticalElementaryCells        : 3;
-               MosaicCellVector mosaicCells;
-
-       public:
-               MosaicDescriptor(const uint8_t * const buffer);
-               ~MosaicDescriptor(void);
-
-               uint8_t getMosaicEntryPoint(void) const;
-               uint8_t getNumberOfHorizontalElementaryCells(void) const;
-               uint8_t getNumberOfVerticalElementaryCells(void) const;
-               const MosaicCellVector *getMosaicCells(void) const;
-};
-
-#endif /* __dvb_descriptor_mosaic_descriptor_h__ */
diff --git a/lib/dvb_si/multilingual_bouquet_name_descriptor.cpp b/lib/dvb_si/multilingual_bouquet_name_descriptor.cpp
deleted file mode 100644 (file)
index d628dc0..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id: multilingual_bouquet_name_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/multilingual_bouquet_name_descriptor.h>
-
-MultilingualBouquetName::MultilingualBouquetName(const uint8_t * const buffer)
-{
-       iso639LanguageCode.assign((char *)&buffer[0], 3);
-       bouquetNameLength = buffer[3];
-       bouquetName.assign((char *)&buffer[4], bouquetNameLength);
-}
-
-std::string MultilingualBouquetName::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-std::string MultilingualBouquetName::getBouquetName(void) const
-{
-       return bouquetName;
-}
-
-MultilingualBouquetNameDescriptor::MultilingualBouquetNameDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += buffer[i + 3] + 2)
-               multilingualBouquetNames.push_back(new MultilingualBouquetName(&buffer[i + 2]));
-}
-
-MultilingualBouquetNameDescriptor::~MultilingualBouquetNameDescriptor(void)
-{
-       for (MultilingualBouquetNameIterator i = multilingualBouquetNames.begin(); i != multilingualBouquetNames.end(); ++i)
-               delete *i;
-}
-
-const MultilingualBouquetNameVector *MultilingualBouquetNameDescriptor::getMultilingualBouquetNames(void) const
-{
-       return &multilingualBouquetNames;
-}
-
diff --git a/lib/dvb_si/multilingual_bouquet_name_descriptor.h b/lib/dvb_si/multilingual_bouquet_name_descriptor.h
deleted file mode 100644 (file)
index 3864f74..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id: multilingual_bouquet_name_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_multilingual_bouquet_name_descriptor_h__
-#define __dvb_descriptor_multilingual_bouquet_name_descriptor_h__
-
-#include "descriptor.h"
-
-class MultilingualBouquetName
-{
-       protected:
-               std::string iso639LanguageCode;
-               unsigned bouquetNameLength                      : 8;
-               std::string bouquetName;
-
-       public:
-               MultilingualBouquetName(const uint8_t * const buffer);
-
-               std::string getIso639LanguageCode(void) const;
-               std::string getBouquetName(void) const;
-};
-
-typedef std::vector<MultilingualBouquetName *> MultilingualBouquetNameVector;
-typedef MultilingualBouquetNameVector::iterator MultilingualBouquetNameIterator;
-typedef MultilingualBouquetNameVector::const_iterator MultilingualBouquetNameConstIterator;
-
-class MultilingualBouquetNameDescriptor : public Descriptor
-{
-       protected:
-               MultilingualBouquetNameVector multilingualBouquetNames;
-
-       public:
-               MultilingualBouquetNameDescriptor(const uint8_t * const buffer);
-               ~MultilingualBouquetNameDescriptor(void);
-
-               const MultilingualBouquetNameVector *getMultilingualBouquetNames(void) const;
-};
-
-#endif /* __dvb_descriptor_multilingual_bouquet_name_descriptor_h__ */
diff --git a/lib/dvb_si/multilingual_component_descriptor.cpp b/lib/dvb_si/multilingual_component_descriptor.cpp
deleted file mode 100644 (file)
index ecd4950..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * $Id: multilingual_component_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/multilingual_component_descriptor.h>
-
-MultilingualComponent::MultilingualComponent(const uint8_t * const buffer)
-{
-       iso639LanguageCode.assign((char *)&buffer[0], 3);
-       textDescriptionLength = buffer[3];
-       text.assign((char *)&buffer[4], textDescriptionLength);
-}
-
-std::string MultilingualComponent::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-std::string MultilingualComponent::getText(void) const
-{
-       return text;
-}
-
-MultilingualComponentDescriptor::MultilingualComponentDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       componentTag = buffer[2];
-
-       for (uint16_t i = 0; i < descriptorLength - 1; i += buffer[i + 4] + 2)
-               multilingualComponents.push_back(new MultilingualComponent(&buffer[i + 3]));
-}
-
-MultilingualComponentDescriptor::~MultilingualComponentDescriptor(void)
-{
-       for (MultilingualComponentIterator i = multilingualComponents.begin(); i != multilingualComponents.end(); ++i)
-               delete *i;
-}
-
-uint8_t MultilingualComponentDescriptor::getComponentTag(void) const
-{
-       return componentTag;
-}
-
-const MultilingualComponentVector *MultilingualComponentDescriptor::getMultilingualComponents(void) const
-{
-       return &multilingualComponents;
-}
-
diff --git a/lib/dvb_si/multilingual_component_descriptor.h b/lib/dvb_si/multilingual_component_descriptor.h
deleted file mode 100644 (file)
index d7d2101..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $Id: multilingual_component_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_multilingual_component_descriptor_h__
-#define __dvb_descriptor_multilingual_component_descriptor_h__
-
-#include "descriptor.h"
-
-class MultilingualComponent
-{
-       protected:
-               std::string iso639LanguageCode;
-               unsigned textDescriptionLength                  : 8;
-               std::string text;
-
-       public:
-               MultilingualComponent(const uint8_t * const buffer);
-
-               std::string getIso639LanguageCode(void) const;
-               std::string getText(void) const;
-};
-
-typedef std::vector<MultilingualComponent *> MultilingualComponentVector;
-typedef MultilingualComponentVector::iterator MultilingualComponentIterator;
-typedef MultilingualComponentVector::const_iterator MultilingualComponentConstIterator;
-
-class MultilingualComponentDescriptor : public Descriptor
-{
-       protected:
-               unsigned componentTag                           : 8;
-               MultilingualComponentVector multilingualComponents;
-
-       public:
-               MultilingualComponentDescriptor(const uint8_t * const buffer);
-               ~MultilingualComponentDescriptor(void);
-
-               uint8_t getComponentTag(void) const;
-               const MultilingualComponentVector *getMultilingualComponents(void) const;
-};
-
-#endif /* __dvb_descriptor_multilingual_component_descriptor_h__ */
diff --git a/lib/dvb_si/multilingual_network_name_descriptor.cpp b/lib/dvb_si/multilingual_network_name_descriptor.cpp
deleted file mode 100644 (file)
index 8bccc6c..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id: multilingual_network_name_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/multilingual_network_name_descriptor.h>
-
-MultilingualNetworkName::MultilingualNetworkName(const uint8_t * const buffer)
-{
-       iso639LanguageCode.assign((char *)&buffer[0], 3);
-       networkNameLength = buffer[3];
-       networkName.assign((char *)&buffer[4], networkNameLength);
-}
-
-std::string MultilingualNetworkName::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-std::string MultilingualNetworkName::getNetworkName(void) const
-{
-       return networkName;
-}
-
-MultilingualNetworkNameDescriptor::MultilingualNetworkNameDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += buffer[i + 5] + 4)
-               multilingualNetworkNames.push_back(new MultilingualNetworkName(&buffer[i + 2]));
-}
-
-MultilingualNetworkNameDescriptor::~MultilingualNetworkNameDescriptor(void)
-{
-       for (MultilingualNetworkNameIterator i = multilingualNetworkNames.begin(); i != multilingualNetworkNames.end(); ++i)
-               delete *i;
-}
-
-const MultilingualNetworkNameVector *MultilingualNetworkNameDescriptor::getMultilingualNetworkNames(void) const
-{
-       return &multilingualNetworkNames;
-}
-
diff --git a/lib/dvb_si/multilingual_network_name_descriptor.h b/lib/dvb_si/multilingual_network_name_descriptor.h
deleted file mode 100644 (file)
index b7df57b..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Id: multilingual_network_name_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_multilingual_network_name_descriptor_h__
-#define __dvb_descriptor_multilingual_network_name_descriptor_h__
-
-#include "descriptor.h"
-
-class MultilingualNetworkName
-{
-       protected:
-               std::string iso639LanguageCode;
-               unsigned networkNameLength                      : 8;
-               std::string networkName;
-
-       public:
-               MultilingualNetworkName(const uint8_t * const buffer);
-
-               std::string getIso639LanguageCode(void) const;
-               std::string getNetworkName(void) const;
-};
-
-typedef std::vector<MultilingualNetworkName *> MultilingualNetworkNameVector;
-typedef MultilingualNetworkNameVector::iterator MultilingualNetworkNameIterator;
-typedef MultilingualNetworkNameVector::const_iterator MultilingualNetworkNameConstIterator;
-
-class MultilingualNetworkNameDescriptor : public Descriptor
-{
-       protected:
-               MultilingualNetworkNameVector multilingualNetworkNames;
-
-       public:
-               MultilingualNetworkNameDescriptor(const uint8_t * const buffer);
-               ~MultilingualNetworkNameDescriptor(void);
-
-               const MultilingualNetworkNameVector *getMultilingualNetworkNames(void) const;
-};
-
-#endif /* __dvb_descriptor_multilingual_network_name_descriptor_h__ */
diff --git a/lib/dvb_si/multilingual_service_name_descriptor.cpp b/lib/dvb_si/multilingual_service_name_descriptor.cpp
deleted file mode 100644 (file)
index d811aae..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * $Id: multilingual_service_name_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/multilingual_service_name_descriptor.h>
-
-MultilingualServiceName::MultilingualServiceName(const uint8_t * const buffer)
-{
-       iso639LanguageCode.assign((char *)&buffer[0], 3);
-       serviceProviderNameLength = buffer[3];
-       serviceProviderName.assign((char *)&buffer[4], serviceProviderNameLength);
-       serviceNameLength = buffer[serviceProviderNameLength + 4];
-       serviceName.assign((char *)&buffer[serviceProviderNameLength + 5], serviceNameLength);
-}
-
-std::string MultilingualServiceName::getIso639LanguageCode(void) const
-{
-       return iso639LanguageCode;
-}
-
-std::string MultilingualServiceName::getServiceProviderName(void) const
-{
-       return serviceProviderName;
-}
-
-std::string MultilingualServiceName::getServiceName(void) const
-{
-       return serviceName;
-}
-
-MultilingualServiceNameDescriptor::MultilingualServiceNameDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       MultilingualServiceName *name;
-
-       for (uint16_t i = 0; i < descriptorLength; i += name->serviceProviderNameLength + name->serviceNameLength + 5) {
-               name = new MultilingualServiceName(&buffer[i + 2]);
-               multilingualServiceNames.push_back(name);
-       }
-}
-
-MultilingualServiceNameDescriptor::~MultilingualServiceNameDescriptor(void)
-{
-       for (MultilingualServiceNameIterator i = multilingualServiceNames.begin(); i != multilingualServiceNames.end(); ++i)
-               delete *i;
-}
-
-const MultilingualServiceNameVector *MultilingualServiceNameDescriptor::getMultilingualServiceNames(void) const
-{
-       return &multilingualServiceNames;
-}
-
diff --git a/lib/dvb_si/multilingual_service_name_descriptor.h b/lib/dvb_si/multilingual_service_name_descriptor.h
deleted file mode 100644 (file)
index 5979b5c..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * $Id: multilingual_service_name_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_multilingual_service_name_descriptor_h__
-#define __dvb_descriptor_multilingual_service_name_descriptor_h__
-
-#include "descriptor.h"
-
-class MultilingualServiceName
-{
-       protected:
-               std::string iso639LanguageCode;
-               unsigned serviceProviderNameLength              : 8;
-               std::string serviceProviderName;
-               unsigned serviceNameLength                      : 8;
-               std::string serviceName;
-
-       public:
-               MultilingualServiceName(const uint8_t * const buffer);
-
-               std::string getIso639LanguageCode(void) const;
-               std::string getServiceProviderName(void) const;
-               std::string getServiceName(void) const;
-
-       friend class MultilingualServiceNameDescriptor;
-};
-
-typedef std::vector<MultilingualServiceName *> MultilingualServiceNameVector;
-typedef MultilingualServiceNameVector::iterator MultilingualServiceNameIterator;
-typedef MultilingualServiceNameVector::const_iterator MultilingualServiceNameConstIterator;
-
-class MultilingualServiceNameDescriptor : public Descriptor
-{
-       protected:
-               MultilingualServiceNameVector multilingualServiceNames;
-
-       public:
-               MultilingualServiceNameDescriptor(const uint8_t * const buffer);
-               ~MultilingualServiceNameDescriptor(void);
-
-               const MultilingualServiceNameVector *getMultilingualServiceNames(void) const;
-};
-
-#endif /* __dvb_descriptor_multilingual_service_name_descriptor_h__ */
diff --git a/lib/dvb_si/multiplex_buffer_utilization_descriptor.h b/lib/dvb_si/multiplex_buffer_utilization_descriptor.h
deleted file mode 100644 (file)
index dc7a160..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * $Id: multiplex_buffer_utilization_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_multiplex_buffer_utilization_descriptor_h__
-#define __dvb_descriptor_multiplex_buffer_utilization_descriptor_h__
-
-#include "descriptor.h"
-
-class MultiplexBufferUtilizationDescriptor : public Descriptor
-{
-       protected:
-               unsigned boundValidFlag                         : 1;
-               unsigned ltwOffsetLowerBound                    : 15;
-               unsigned reserved                               : 1;
-               unsigned ltwOffsetUpperBound                    : 15;
-
-       public:
-               MultiplexBufferUtilizationDescriptor(const uint8_t * const buffer);
-
-               uint8_t getBoundValidFlag(void) const;
-               uint16_t getLtwOffsetLowerBound(void) const;
-               uint16_t getLtwOffsetUpperBound(void) const;
-};
-
-#endif /* __dvb_descriptor_multiplex_buffer_utilization_descriptor_h__ */
diff --git a/lib/dvb_si/network_name_descriptor.cpp b/lib/dvb_si/network_name_descriptor.cpp
deleted file mode 100644 (file)
index 3ba3872..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * $Id: network_name_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/network_name_descriptor.h>
-
-NetworkNameDescriptor::NetworkNameDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       networkName.assign((char *)&buffer[2], descriptorLength);
-}
-
-std::string NetworkNameDescriptor::getNetworkName(void) const
-{
-       return networkName;
-}
-
diff --git a/lib/dvb_si/network_name_descriptor.h b/lib/dvb_si/network_name_descriptor.h
deleted file mode 100644 (file)
index 694e370..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $Id: network_name_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_network_name_descriptor_h__
-#define __dvb_descriptor_network_name_descriptor_h__
-
-#include "descriptor.h"
-
-class NetworkNameDescriptor : public Descriptor
-{
-       protected:
-               std::string networkName;
-
-       public:
-               NetworkNameDescriptor(const uint8_t * const buffer);
-
-               std::string getNetworkName(void) const;
-};
-
-#endif /* __dvb_descriptor_network_name_descriptor_h__ */
diff --git a/lib/dvb_si/nit.cpp b/lib/dvb_si/nit.cpp
deleted file mode 100644 (file)
index dcf90e3..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * $Id: nit.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/nit.h>
-
-TransportStreamInfo::TransportStreamInfo(const uint8_t * const buffer)
-{
-       transportStreamId = (buffer[0] << 8) | buffer[1];
-       originalNetworkId = (buffer[2] << 8) | buffer[3];
-       reserved1 = (buffer[4] >> 8) & 0x0F;
-       transportDescriptorsLength = ((buffer[4] & 0x0F) << 8) | buffer[5];
-
-       for (uint16_t i = 6; i < transportDescriptorsLength + 6; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-}
-
-uint16_t TransportStreamInfo::getTransportStreamId(void) const
-{
-       return transportStreamId;
-}
-
-uint16_t TransportStreamInfo::getOriginalNetworkId(void) const
-{
-       return originalNetworkId;
-}
-
-NetworkInformationTable::NetworkInformationTable(const uint8_t * const buffer) : LongCrcTable(buffer)
-{
-       reserved4 = (buffer[8] >> 5) & 0x0F;
-       networkDescriptorsLength = ((buffer[8] & 0x0F) << 8) | buffer[9];
-
-       for (uint16_t i = 10; i < networkDescriptorsLength + 10; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-
-       reserved5 = (buffer[networkDescriptorsLength + 10] >> 4) & 0x0F;
-       transportStreamLoopLength = ((buffer[networkDescriptorsLength + 10] & 0x0F) << 8) | buffer[networkDescriptorsLength + 11];
-
-       for (uint16_t i = networkDescriptorsLength + 12; i < sectionLength + 3 - 4; i += ((buffer[i + 4] & 0x0F) | buffer[i + 5]) + 6)
-               tsInfo.push_back(new TransportStreamInfo(&buffer[i]));
-}
-
-NetworkInformationTable::~NetworkInformationTable(void)
-{
-       for (TransportStreamInfoIterator i = tsInfo.begin(); i != tsInfo.end(); ++i)
-               delete *i;
-}
-
-const TransportStreamInfoVector *NetworkInformationTable::getTsInfo(void) const
-{
-       return &tsInfo;
-}
-
diff --git a/lib/dvb_si/nit.h b/lib/dvb_si/nit.h
deleted file mode 100644 (file)
index de92a34..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * $Id: nit.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_nit_h__
-#define __dvb_table_nit_h__
-
-#include <lib/dvb_si/container.h>
-#include "long_crc_table.h"
-
-class TransportStreamInfo : public DescriptorContainer
-{
-       protected:
-               unsigned transportStreamId                      : 16;
-               unsigned originalNetworkId                      : 16;
-               unsigned reserved1                              : 4;
-               unsigned transportDescriptorsLength             : 12;
-
-       public:
-               TransportStreamInfo(const uint8_t * const buffer);
-
-               uint16_t getTransportStreamId(void) const;
-               uint16_t getOriginalNetworkId(void) const;
-};
-
-typedef std::vector<TransportStreamInfo *> TransportStreamInfoVector;
-typedef TransportStreamInfoVector::iterator TransportStreamInfoIterator;
-typedef TransportStreamInfoVector::const_iterator TransportStreamInfoConstIterator;
-
-class NetworkInformationTable : public LongCrcTable, public DescriptorContainer
-{
-       protected:
-               unsigned reserved4                              : 3;
-               unsigned networkDescriptorsLength               : 12;
-               unsigned reserved5                              : 4;
-               unsigned transportStreamLoopLength              : 12;
-               TransportStreamInfoVector tsInfo;
-
-       public:
-               NetworkInformationTable(const uint8_t * const buffer);
-               ~NetworkInformationTable(void);
-
-               static const enum PacketId PID = PID_NIT;
-               static const enum TableId TID = TID_NIT_ACTUAL;
-               static const uint32_t TIMEOUT = 12000;
-
-               const TransportStreamInfoVector *getTsInfo(void) const;
-};
-
-typedef std::vector<NetworkInformationTable *> NetworkInformationTableVector;
-typedef NetworkInformationTableVector::iterator NetworkInformationTableIterator;
-typedef NetworkInformationTableVector::const_iterator NetworkInformationTableConstIterator;
-
-#endif /* __dvb_table_nit_h__ */
diff --git a/lib/dvb_si/nvod_reference_descriptor.cpp b/lib/dvb_si/nvod_reference_descriptor.cpp
deleted file mode 100644 (file)
index d742581..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * $Id: nvod_reference_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/nvod_reference_descriptor.h>
-
-
-NvodReference::NvodReference(const uint8_t * const buffer)
-{
-       transportStreamId = (buffer[0] << 8) | buffer[1];
-       originalNetworkId = (buffer[2] << 8) | buffer[3];
-       serviceId = (buffer[4] << 8) | buffer[5];
-}
-
-uint16_t NvodReference::getTransportStreamId(void) const
-{
-       return transportStreamId;
-}
-
-uint16_t NvodReference::getOriginalNetworkId(void) const
-{
-       return originalNetworkId;
-}
-
-uint16_t NvodReference::getServiceId(void) const
-{
-       return serviceId;
-}
-
-NvodReferenceDescriptor::NvodReferenceDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += 6)
-               nvodReferences.push_back(new NvodReference(&buffer[i + 2]));
-}
-
-NvodReferenceDescriptor::~NvodReferenceDescriptor(void)
-{
-       for (NvodReferenceIterator i = nvodReferences.begin(); i != nvodReferences.end(); ++i)
-               delete *i;
-}
-
-const NvodReferenceVector *NvodReferenceDescriptor::getNvodReferences(void) const
-{
-       return &nvodReferences;
-}
-
diff --git a/lib/dvb_si/nvod_reference_descriptor.h b/lib/dvb_si/nvod_reference_descriptor.h
deleted file mode 100644 (file)
index 4b434c3..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * $Id: nvod_reference_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_nvod_reference_descriptor_h__
-#define __dvb_descriptor_nvod_reference_descriptor_h__
-
-#include "descriptor.h"
-
-class NvodReference
-{
-       protected:
-               unsigned transportStreamId                      : 16;
-               unsigned originalNetworkId                      : 16;
-               unsigned serviceId                              : 16;
-
-       public:
-               NvodReference(const uint8_t * const buffer);
-
-               uint16_t getTransportStreamId(void) const;
-               uint16_t getOriginalNetworkId(void) const;
-               uint16_t getServiceId(void) const;
-};
-
-typedef std::vector<NvodReference *> NvodReferenceVector;
-typedef NvodReferenceVector::iterator NvodReferenceIterator;
-typedef NvodReferenceVector::const_iterator NvodReferenceConstIterator;
-
-class NvodReferenceDescriptor : public Descriptor
-{
-       protected:
-               NvodReferenceVector nvodReferences;
-
-       public:
-               NvodReferenceDescriptor(const uint8_t * const buffer);
-               ~NvodReferenceDescriptor(void);
-
-               const NvodReferenceVector* getNvodReferences(void) const;
-};
-
-#endif /* __dvb_descriptor_nvod_reference_descriptor_h__ */
diff --git a/lib/dvb_si/packet_id.h b/lib/dvb_si/packet_id.h
deleted file mode 100644 (file)
index 3f18f08..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * $Id: packet_id.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_id_packet_id_h__
-#define __dvb_id_packet_id_h__
-
-enum PacketId {
-       /* ETSI EN 300 468 V1.5.1 (2003-01) */
-       PID_PAT         = 0x0000,
-       PID_CAT         = 0x0001,
-       PID_TSDT        = 0x0002,
-       PID_NIT         = 0x0010,
-       PID_BAT         = 0x0011,
-       PID_SDT         = 0x0011,
-       PID_EIT         = 0x0012,
-       PID_RST         = 0x0013,
-       PID_TDT         = 0x0014,
-       PID_TOT         = 0x0014,
-       PID_NS          = 0x0015,       /* network synchronization */
-       PID_IS          = 0x001C,       /* inband signaling (SIS-12) */
-       PID_M           = 0x001D,       /* measurement (SIS-10) */
-       PID_DIT         = 0x001E,
-       PID_SIT         = 0x001F,
-       PID_RESERVED    = 0x1FFF
-};
-
-#endif /* __dvb_id_packet_id_h__ */
diff --git a/lib/dvb_si/parental_rating_descriptor.cpp b/lib/dvb_si/parental_rating_descriptor.cpp
deleted file mode 100644 (file)
index 3926267..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * $Id: parental_rating_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/parental_rating_descriptor.h>
-
-ParentalRating::ParentalRating(const uint8_t * const buffer)
-{
-       countryCode.assign((char *)&buffer[0], 3);
-       rating = buffer[3];
-}
-
-std::string ParentalRating::getCountryCode(void) const
-{
-       return countryCode;
-}
-
-uint8_t ParentalRating::getRating(void) const
-{
-       return rating;
-}
-
-ParentalRatingDescriptor::ParentalRatingDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       for (uint16_t i = 0; i < descriptorLength; i += 4)
-               parentalRatings.push_back(new ParentalRating(&buffer[i + 2]));
-}
-
-ParentalRatingDescriptor::~ParentalRatingDescriptor(void)
-{
-       for (ParentalRatingIterator i = parentalRatings.begin(); i != parentalRatings.end(); ++i)
-               delete *i;
-}
-
-const ParentalRatingVector *ParentalRatingDescriptor::getParentalRatings(void) const
-{
-       return &parentalRatings;
-}
-
diff --git a/lib/dvb_si/parental_rating_descriptor.h b/lib/dvb_si/parental_rating_descriptor.h
deleted file mode 100644 (file)
index 5528872..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * $Id: parental_rating_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_parental_rating_descriptor_h__
-#define __dvb_descriptor_parental_rating_descriptor_h__
-
-#include "descriptor.h"
-
-class ParentalRating
-{
-       protected:
-               std::string countryCode;
-               unsigned rating                                 : 8;
-
-       public:
-               ParentalRating(const uint8_t * const buffer);
-
-               std::string getCountryCode(void) const;
-               uint8_t getRating(void) const;
-};
-
-typedef std::vector<ParentalRating *> ParentalRatingVector;
-typedef ParentalRatingVector::iterator ParentalRatingIterator;
-typedef ParentalRatingVector::const_iterator ParentalRatingConstIterator;
-
-class ParentalRatingDescriptor : public Descriptor
-{
-       protected:
-               ParentalRatingVector parentalRatings;
-
-       public:
-               ParentalRatingDescriptor(const uint8_t * const buffer);
-               ~ParentalRatingDescriptor(void);
-
-               const ParentalRatingVector *getParentalRatings(void) const;
-};
-
-#endif /* __dvb_descriptor_parental_rating_descriptor_h__ */
diff --git a/lib/dvb_si/partial_transport_stream_descriptor.h b/lib/dvb_si/partial_transport_stream_descriptor.h
deleted file mode 100644 (file)
index dc91226..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * $Id: partial_transport_stream_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_partial_transport_stream_descriptor_h__
-#define __dvb_descriptor_partial_transport_stream_descriptor_h__
-
-#include "descriptor.h"
-
-class PartialTransportStreamDescriptor : public Descriptor
-{
-       protected:
-               unsigned reserved                               : 2;
-               unsigned peakRate                               : 22;
-               unsigned reserved2                              : 2;
-               unsigned minimumOverallSmootingRate             : 22;
-               unsigned reserved3                              : 2;
-               unsigned maximumOverallSmoothingBuffer          : 14;
-
-       public:
-               PartialTransportStreamDescriptor(const uint8_t * const buffer);
-
-               uint32_t getPeakRate(void) const;
-               uint32_t getMinimumOverallSmoothingRate(void) const;
-               uint16_t getMaximumOverallSmoothingBuffer(void) const;
-};
-
-#endif /* __dvb_descriptor_partial_transport_stream_descriptor_h__ */
diff --git a/lib/dvb_si/pat.cpp b/lib/dvb_si/pat.cpp
deleted file mode 100644 (file)
index 498f67f..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * $Id: pat.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/pat.h>
-
-NetworkAssociation::NetworkAssociation(const uint8_t * const buffer)
-{
-       programNumber = (buffer[0] << 8) | buffer[1];
-       reserved = (buffer[2] >> 5) & 0x07;
-       networkPid = ((buffer[2] & 0x1F) << 8) | buffer[3];
-}
-
-uint16_t NetworkAssociation::getNetworkPid(void) const
-{
-       return networkPid;
-}
-
-ProgramAssociation::ProgramAssociation(const uint8_t * const buffer)
-{
-       programNumber = (buffer[0] << 8) | buffer[1];
-       reserved = (buffer[2] >> 5) & 0x07;
-       programMapPid = ((buffer[2] & 0x1F) << 8) | buffer[3];
-}
-
-uint16_t ProgramAssociation::getProgramNumber(void) const
-{
-       return programNumber;
-}
-
-uint16_t ProgramAssociation::getProgramMapPid(void) const
-{
-       return programMapPid;
-}
-
-ProgramAssociationTable::ProgramAssociationTable(const uint8_t * const buffer) : LongCrcTable(buffer)
-{
-       for (uint16_t i = 8; i < sectionLength - 1; i += 4) {
-               if (((buffer[i] << 8) | buffer[i + 1]) == 0)
-                       networks.push_back(new NetworkAssociation(&buffer[i]));
-               else
-                       programs.push_back(new ProgramAssociation(&buffer[i]));
-       }
-}
-
-ProgramAssociationTable::~ProgramAssociationTable(void)
-{
-       for (NetworkAssociationIterator i = networks.begin(); i != networks.end(); ++i)
-               delete *i;
-
-       for (ProgramAssociationIterator i = programs.begin(); i != programs.end(); ++i)
-               delete *i;
-}
-
-const NetworkAssociationVector *ProgramAssociationTable::getNetworks(void) const
-{
-       return &networks;
-}
-
-const ProgramAssociationVector *ProgramAssociationTable::getPrograms(void) const
-{
-       return &programs;
-}
-
diff --git a/lib/dvb_si/pat.h b/lib/dvb_si/pat.h
deleted file mode 100644 (file)
index f17586a..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * $Id: pat.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_pat_h__
-#define __dvb_table_pat_h__
-
-#include "long_crc_table.h"
-
-class NetworkAssociation
-{
-       protected:
-               unsigned programNumber                          : 16;
-               unsigned reserved                               : 3;
-               unsigned networkPid                             : 13;
-
-       public:
-               NetworkAssociation(const uint8_t * buffer);
-
-               uint16_t getNetworkPid(void) const;
-};
-
-typedef std::vector<NetworkAssociation *> NetworkAssociationVector;
-typedef NetworkAssociationVector::iterator NetworkAssociationIterator;
-typedef NetworkAssociationVector::const_iterator NetworkAssociationConstIterator;
-
-class ProgramAssociation
-{
-       protected:
-               unsigned programNumber                          : 16;
-               unsigned reserved                               : 3;
-               unsigned programMapPid                          : 13;
-
-       public:
-               ProgramAssociation(const uint8_t * buffer);
-
-               uint16_t getProgramNumber(void) const;
-               uint16_t getProgramMapPid(void) const;
-};
-
-typedef std::vector<ProgramAssociation *> ProgramAssociationVector;
-typedef ProgramAssociationVector::iterator ProgramAssociationIterator;
-typedef ProgramAssociationVector::const_iterator ProgramAssociationConstIterator;
-
-class ProgramAssociationTable : public LongCrcTable
-{
-       protected:
-               NetworkAssociationVector networks;
-               ProgramAssociationVector programs;
-
-       public:
-               ProgramAssociationTable(const uint8_t * const buffer);
-               ~ProgramAssociationTable(void);
-
-               static const enum PacketId PID = PID_PAT;
-               static const enum TableId TID = TID_PAT;
-               static const uint32_t TIMEOUT = 1200;
-
-               const NetworkAssociationVector *getNetworks(void) const;
-               const ProgramAssociationVector *getPrograms(void) const;
-};
-
-typedef std::vector<ProgramAssociationTable *> ProgramAssociationTableVector;
-typedef ProgramAssociationTableVector::iterator ProgramAssociationTableIterator;
-typedef ProgramAssociationTableVector::const_iterator ProgramAssociationTableConstIterator;
-
-#endif /* __dvb_table_pat_h__ */
diff --git a/lib/dvb_si/pdc_descriptor.cpp b/lib/dvb_si/pdc_descriptor.cpp
deleted file mode 100644 (file)
index 8a8c61a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * $Id: pdc_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/pdc_descriptor.h>
-
-PdcDescriptor::PdcDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       reserved = (buffer[2] >> 4) & 0x0f;
-       programmeIdentificationLabel = ((buffer[2] & 0x0f) << 16) | buffer[3] | buffer[4];
-}
-
-uint32_t PdcDescriptor::getProgrammeIdentificationLabel(void) const
-{
-       return programmeIdentificationLabel;
-}
-
diff --git a/lib/dvb_si/pdc_descriptor.h b/lib/dvb_si/pdc_descriptor.h
deleted file mode 100644 (file)
index 0c8851b..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $Id: pdc_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_pdc_descriptor_h__
-#define __dvb_descriptor_pdc_descriptor_h__
-
-#include "descriptor.h"
-
-class PdcDescriptor : public Descriptor
-{
-       protected:
-               unsigned reserved                               : 4;
-               unsigned programmeIdentificationLabel           : 20;
-
-       public:
-               PdcDescriptor(const uint8_t * const buffer);
-
-               uint32_t getProgrammeIdentificationLabel(void) const;
-};
-
-#endif /* __dvb_descriptor_pcd_descriptor_h__ */
diff --git a/lib/dvb_si/pmt.cpp b/lib/dvb_si/pmt.cpp
deleted file mode 100644 (file)
index 1c0da43..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * $Id: pmt.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/pmt.h>
-
-ElementaryStreamInfo::ElementaryStreamInfo(const uint8_t * const buffer)
-{
-       streamType = buffer[0];
-       reserved1 = (buffer[1] >> 5) & 0x07;
-       elementaryPid = ((buffer[1] & 0x1F) << 8) | buffer[2];
-       reserved2 = (buffer[3] >> 4) & 0x0F;
-       esInfoLength = ((buffer[3] & 0x0F) << 8) | buffer[4];
-
-       for (uint16_t i = 5; i < esInfoLength + 5; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-}
-
-uint8_t ElementaryStreamInfo::getType(void) const
-{
-       return streamType;
-}
-
-uint16_t ElementaryStreamInfo::getPid(void) const
-{
-       return elementaryPid;
-}
-
-ProgramMapTable::ProgramMapTable(const uint8_t * const buffer) : LongCrcTable(buffer)
-{
-       reserved4 = (buffer[8] >> 5) & 0x07;
-       pcrPid = ((buffer[8] & 0x1F) << 8) | buffer[9];
-       reserved5 = (buffer[10] >> 4) & 0x0F;
-       programInfoLength = ((buffer[10] & 0x0F) << 8) | buffer[11];
-
-       for (uint16_t i = 12; i < programInfoLength + 12; i += buffer[i + 1] + 2)
-               descriptor(&buffer[i]);
-
-       for (uint16_t i = programInfoLength + 12; i < sectionLength - 1; i += ((buffer[i + 3] & 0x0F) | buffer[i + 4]) + 5)
-               esInfo.push_back(new ElementaryStreamInfo(&buffer[i]));
-}
-
-uint16_t ProgramMapTable::getPcrPid(void) const
-{
-       return pcrPid;
-}
-
-const ElementaryStreamInfoVector *ProgramMapTable::getEsInfo(void) const
-{
-       return &esInfo;
-}
-
-ProgramMapTable::~ProgramMapTable(void)
-{
-       for (ElementaryStreamInfoIterator i = esInfo.begin(); i != esInfo.end(); ++i)
-               delete *i;
-}
-
diff --git a/lib/dvb_si/pmt.h b/lib/dvb_si/pmt.h
deleted file mode 100644 (file)
index c82413e..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * $Id: pmt.h,v 1.2 2005-04-30 17:57:48 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_table_pmt_h__
-#define __dvb_table_pmt_h__
-
-#include <lib/dvb_si/container.h>
-#include "long_crc_table.h"
-
-class ElementaryStreamInfo : public DescriptorContainer
-{
-       protected:
-               unsigned streamType                             : 8;
-               unsigned reserved1                              : 3;
-               unsigned elementaryPid                          : 13;
-               unsigned reserved2                              : 4;
-               unsigned esInfoLength                           : 12;
-
-       public:
-               ElementaryStreamInfo(const uint8_t * const buffer);
-
-               uint8_t getType(void) const;
-               uint16_t getPid(void) const;
-
-       friend class CaElementaryStreamInfo;
-
-};
-
-typedef std::vector<ElementaryStreamInfo *> ElementaryStreamInfoVector;
-typedef ElementaryStreamInfoVector::iterator ElementaryStreamInfoIterator;
-typedef ElementaryStreamInfoVector::const_iterator ElementaryStreamInfoConstIterator;
-
-class ProgramMapTable : public LongCrcTable, public DescriptorContainer
-{
-       protected:
-               unsigned reserved4                              : 3;
-               unsigned pcrPid                                 : 13;
-               unsigned reserved5                              : 4;
-               unsigned programInfoLength                      : 12;
-               ElementaryStreamInfoVector esInfo;
-
-       public:
-               ProgramMapTable(const uint8_t * const buffer);
-               ~ProgramMapTable(void);
-
-               static const enum TableId TID = TID_PMT;
-               static const uint32_t TIMEOUT = 6000;
-
-               uint16_t getPcrPid(void) const;
-               const ElementaryStreamInfoVector *getEsInfo(void) const;
-
-       friend class CaProgramMapTable;
-};
-
-typedef std::vector<ProgramMapTable *> ProgramMapTableVector;
-typedef ProgramMapTableVector::iterator ProgramMapTableIterator;
-typedef ProgramMapTableVector::const_iterator ProgramMapTableConstIterator;
-
-#endif /* __dvb_table_pmt_h__ */
diff --git a/lib/dvb_si/private_data_indicator_descriptor.h b/lib/dvb_si/private_data_indicator_descriptor.h
deleted file mode 100644 (file)
index 8e783cd..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $Id: private_data_indicator_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_private_data_indicator_descriptor_h__
-#define __dvb_descriptor_private_data_indicator_descriptor_h__
-
-#include "descriptor.h"
-
-class PrivateDataIndicatorDescriptor : public Descriptor
-{
-       protected:
-               unsigned privateDataIndicator                   : 32;
-
-       public:
-               PrivateDataIndicatorDescriptor(const uint8_t * const buffer);
-
-               uint32_t getPrivateDataIndicator(void) const;
-};
-
-#endif /* __dvb_descriptor_private_data_indicator_descriptor_h__ */
diff --git a/lib/dvb_si/private_data_specifier_descriptor.cpp b/lib/dvb_si/private_data_specifier_descriptor.cpp
deleted file mode 100644 (file)
index dedcb71..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * $Id: private_data_specifier_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/private_data_specifier_descriptor.h>
-
-PrivateDataSpecifierDescriptor::PrivateDataSpecifierDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       privateDataSpecifier = (buffer[2] << 24) | (buffer[3] << 16) | (buffer[4] << 8) | buffer[5];
-}
-
-uint32_t PrivateDataSpecifierDescriptor::getPrivateDataSpecifier(void) const
-{
-       return privateDataSpecifier;
-}
-
diff --git a/lib/dvb_si/private_data_specifier_descriptor.h b/lib/dvb_si/private_data_specifier_descriptor.h
deleted file mode 100644 (file)
index 53b0fb5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $Id: private_data_specifier_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_private_data_specifier_descriptor_h__
-#define __dvb_descriptor_private_data_specifier_descriptor_h__
-
-#include "descriptor.h"
-
-class PrivateDataSpecifierDescriptor : public Descriptor
-{
-       protected:
-               unsigned privateDataSpecifier                   : 32;
-
-       public:
-               PrivateDataSpecifierDescriptor(const uint8_t * const buffer);
-
-               uint32_t getPrivateDataSpecifier(void) const;
-};
-
-#endif /* __dvb_descriptor_private_data_specifier_descriptor_h__ */
diff --git a/lib/dvb_si/registration_descriptor.h b/lib/dvb_si/registration_descriptor.h
deleted file mode 100644 (file)
index 0f766a1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: registration_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_registration_descriptor_h__
-#define __dvb_descriptor_registration_descriptor_h__
-
-#include "descriptor.h"
-
-typedef std::vector<uint8_t> AdditionalIdentificationInfoVector;
-typedef AdditionalIdentificationInfoVector::iterator AdditionalIdentificationInfoIterator;
-typedef AdditionalIdentificationInfoVector::const_iterator AdditionalIdentificationInfoConstIterator;
-
-class RegistrationDescriptor : public Descriptor
-{
-       protected:
-               unsigned formatIdentifier                       : 32;
-               AdditionalIdentificationInfoVector additionalIdentificationInfo;
-               
-       private:
-               RegistrationDescriptor(const uint8_t * const buffer);
-
-               uint32_t getFormatIdentifier(void) const;
-               const AdditionalIdentificationInfoVector *getAdditionalIdentificationInfo(void) const;
-};
-
-#endif /* __dvb_descriptor_registration_descriptor_h__ */
diff --git a/lib/dvb_si/satellite_delivery_system_descriptor.cpp b/lib/dvb_si/satellite_delivery_system_descriptor.cpp
deleted file mode 100644 (file)
index 32ff194..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * $Id: satellite_delivery_system_descriptor.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <lib/dvb_si/satellite_delivery_system_descriptor.h>
-
-SatelliteDeliverySystemDescriptor::SatelliteDeliverySystemDescriptor(const uint8_t * const buffer) : Descriptor(buffer)
-{
-       frequency =
-       (
-               ((buffer[2] >> 4)       * 10000000) +
-               ((buffer[2] & 0x0F)     * 1000000) +
-               ((buffer[3] >> 4)       * 100000) +
-               ((buffer[3] & 0x0F)     * 10000) +
-               ((buffer[4] >> 4)       * 1000) +
-               ((buffer[4] & 0x0F)     * 100) +
-               ((buffer[5] >> 4)       * 10) +
-               ((buffer[5] & 0x0F)     * 1)
-       );
-
-       orbitalPosition = (buffer[6] << 8) | buffer[7];
-       westEastFlag = (buffer[8] >> 7) & 0x01;
-       polarization = (buffer[8] >> 5) & 0x03;
-       modulation = buffer[8] & 0x1F;
-
-       symbolRate =
-       (
-               ((buffer[9] >> 4)       * 1000000) +
-               ((buffer[9] & 0x0F)     * 100000) +
-               ((buffer[10] >> 4)      * 10000) +
-               ((buffer[10] & 0x0F)    * 1000) +
-               ((buffer[11] >> 4)      * 100) +
-               ((buffer[11] & 0x0F)    * 10) +
-               ((buffer[12] >> 4)      * 1)
-       );
-
-       fecInner = buffer[12] & 0x0F;
-}
-
-uint32_t SatelliteDeliverySystemDescriptor::getFrequency(void) const
-{
-       return frequency;
-}
-
-uint16_t SatelliteDeliverySystemDescriptor::getOrbitalPosition(void) const
-{
-       return orbitalPosition;
-}
-
-uint8_t SatelliteDeliverySystemDescriptor::getWestEastFlag(void) const
-{
-       return westEastFlag;
-}
-
-uint8_t SatelliteDeliverySystemDescriptor::getPolarization(void) const
-{
-       return polarization;
-}
-
-uint8_t SatelliteDeliverySystemDescriptor::getModulation(void) const
-{
-       return modulation;
-}
-
-uint32_t SatelliteDeliverySystemDescriptor::getSymbolRate(void) const
-{
-       return symbolRate;
-}
-
-uint8_t SatelliteDeliverySystemDescriptor::getFecInner(void) const
-{
-       return fecInner;
-}
-
diff --git a/lib/dvb_si/satellite_delivery_system_descriptor.h b/lib/dvb_si/satellite_delivery_system_descriptor.h
deleted file mode 100644 (file)
index b6c2a66..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * $Id: satellite_delivery_system_descriptor.h,v 1.1 2003-10-17 15:36:38 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __dvb_descriptor_satellite_delivery_system_descriptor_h__
-#define __dvb_descriptor_satellite_delivery_system_descriptor_h__
-
-#include "descriptor.h"
-
-class SatelliteDeliverySystemDescriptor : public Descriptor
-{
-       protected:
-               unsigned frequency                              : 32;
-               unsigned orbitalPosition                        : 16;
-               unsigned westEastFlag                           : 1;
-               unsigned polarization                           : 2;
-               unsigned modulation                             : 5;
-               unsigned symbolRate                             : 28;
-               unsigned fecInner                               : 4;
-
-       public:
-               SatelliteDeliverySystemDescriptor(const uint8_t * const buffer);
-
-               uint32_t getFrequency(void) const;
-               uint16_t getOrbitalPosition(void) const;
-               uint8_t getWestEastFlag(void) const;
-               uint8_t getPolarization(void) const;
-               uint8_t getModulation(void) const;
-               uint32_t getSymbolRate(void) const;
-               uint8_t getFecInner(void) const;
-};
-
-#endif /* __dvb_descriptor_satellite_delivery_system_descriptor_h__ */
diff --git a/lib/dvb_si/sdt.cpp b/lib/dvb_si/sdt.cpp
deleted file mode 100644 (file)
index cce8103..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * $Id: sdt.cpp,v 1.1 2003-10-17 15:36:37 tmbinc Exp $
- *
- * (C) 2002-2003 Andreas Oberritter <obi@saftware.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later