X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FDVBAdapter%2FULEdec.hh;h=f35c7d371710601e67ef026135d55f1de4915dbb;hb=f1fc7057fa65a9509651d08c6c134d136fbb0424;hp=9ec78b0847f02d820ac31a6fc592e1609109a027;hpb=5331a98af6c5cc4c424b3ed834fb1498ea3d83ca;p=senf.git

diff --git a/Examples/DVBAdapter/ULEdec.hh b/Examples/DVBAdapter/ULEdec.hh
index 9ec78b0..f35c7d3 100644
--- a/Examples/DVBAdapter/ULEdec.hh
+++ b/Examples/DVBAdapter/ULEdec.hh
@@ -1,6 +1,6 @@
 // $Id: ULEdec.cc 355 2007-07-26 14:17:02Z tho $
 //
-// Copyright (C) 2006
+// Copyright (C) 2007
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
 //     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
@@ -26,19 +26,12 @@
 #include <iostream>
 #include <iomanip>
 #include <sys/ioctl.h>
-#include <linux/sockios.h>
 #include <linux/dvb/dmx.h> 
 
 #include "Scheduler/Scheduler.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
 #include "Packets/MPEGDVBBundle/TransportPacket.hh"
 #include "Packets/MPEGDVBBundle/SNDUPacket.hh"
-#include "Utils/membind.hh"
 #include "Socket/Protocols/DVB/DVBDemuxHandles.hh"
-#include "Packets/ParseInt.hh"
-#include "Packets/Packet.hh"
-#include "Packets/PacketData.hh"
-#include "Packets/ParseInt.hh"
 
 
 class ULEdec
@@ -49,7 +42,7 @@ public:
 private:
     typedef senf::PacketData::iterator iterator;
     
-    enum ReciverState {
+    enum ReceiverState {
         Idle,
         Reassembly
     };
@@ -59,24 +52,22 @@ private:
     
     senf::SNDUPacket snduPacket;
     
-    ReciverState receiver_state;
+    ReceiverState receiver_state;
     unsigned char priv_tscc;
     bool priv_sndu_type_1;
     iterator snduPacketData_iter;
 
-    static const unsigned BLOCK_SIZE = 16;
-    
-    template <class Iterator>
-    void hexdump(Iterator i, Iterator const & i_end, std::ostream& stream);
-    
     void handleEvent(senf::FileHandle, senf::Scheduler::EventId event);
-    
     void handleTSPacket(senf::TransportPacket tsPacket);
+    void handleSNDUPacket();
     
     iterator readNewSNDUPacket(iterator i_start, iterator i_end);
     iterator readContSNDUPacket(iterator i_start, iterator i_end);
     iterator readRawSNDUPacketData(iterator i_start, iterator i_end);
     
+    inline bool isSDNUPacketComplete(); 
+    inline iterator::difference_type snduPacketBytesLeft();
+    
 };