minor improvements

[senf.git] / Examples / DVBAdapter / ULEdec.hh

diff --git a/Examples/DVBAdapter/ULEdec.hh b/Examples/DVBAdapter/ULEdec.hh
index f35c7d3..03ab0fc 100644 (file)
--- a/Examples/DVBAdapter/ULEdec.hh
+++ b/Examples/DVBAdapter/ULEdec.hh
@@ -22,12 +22,6 @@
 
 // Definition of non-inline non-template functions
 
-#include <string>
-#include <iostream>
-#include <iomanip>
-#include <sys/ioctl.h>
-#include <linux/dvb/dmx.h> 
-
 #include "Scheduler/Scheduler.hh"
 #include "Packets/MPEGDVBBundle/TransportPacket.hh"
 #include "Packets/MPEGDVBBundle/SNDUPacket.hh"
@@ -37,7 +31,7 @@
 class ULEdec
 {
 public:
-    ULEdec();
+    ULEdec(unsigned short adapter=0, unsigned short device=0);
 
 private:
     typedef senf::PacketData::iterator iterator;
@@ -61,15 +55,26 @@ private:
     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);
+    iterator readNewSNDUPacket(iterator i, const iterator i_end);
+    iterator readContSNDUPacket(iterator i, const iterator i_end);
+    iterator readRawSNDUPacketData(iterator i, iterator const i_end);
     
     inline bool isSDNUPacketComplete(); 
     inline iterator::difference_type snduPacketBytesLeft();
     
 };
 
+
+struct ULEdecException : public std::exception
+{
+    ULEdecException(char const * what) : what_(what) {};
+    ULEdecException(std::string const what) : what_(what) {};
+    virtual char const * what() const throw() { return what_.c_str(); }
+    virtual ~ULEdecException() throw() {};
+    std::string what_;
+};
+
+
 \f
 // Local Variables:
 // mode: c++