X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FDVBAdapter%2FULEdec.hh;h=87bf9f36afeba8d2a2a68ebf7085e96a98afdecd;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=df61af833e2c55a74a373ce40d58acb0001668de;hpb=ceba483d966a9fd884b30fb9dac07156b29a4b31;p=senf.git

diff --git a/Examples/DVBAdapter/ULEdec.hh b/Examples/DVBAdapter/ULEdec.hh
index df61af8..87bf9f3 100644
--- a/Examples/DVBAdapter/ULEdec.hh
+++ b/Examples/DVBAdapter/ULEdec.hh
@@ -1,9 +1,9 @@
 // $Id: ULEdec.cc 355 2007-07-26 14:17:02Z tho $
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Thorsten Horstmann <tho@berlios.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
@@ -22,10 +22,10 @@
 
 // Definition of non-inline non-template functions
 
-#include "Scheduler/Scheduler.hh"
-#include "Packets/MPEGDVBBundle/TransportPacket.hh"
-#include "Packets/MPEGDVBBundle/SNDUPacket.hh"
-#include "Socket/Protocols/DVB/DVBDemuxHandles.hh"
+#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Packets/MPEGDVBBundle/TransportPacket.hh>
+#include <senf/Packets/MPEGDVBBundle/SNDUPacket.hh>
+#include <senf/Socket/Protocols/DVB.hh>
 
 
 class ULEdec
@@ -35,43 +35,40 @@ public:
 
 private:
     typedef senf::PacketData::iterator iterator;
-    
+
     enum ReceiverState {
         Idle,
         Reassembly
     };
-    
+
     senf::DVBDemuxPESHandle demuxHandle;
     senf::DVBDvrHandle dvrHandle;
-    
+
     senf::SNDUPacket snduPacket;
-    
+
     ReceiverState receiver_state;
     unsigned char priv_tscc;
     bool priv_sndu_type_1;
     iterator snduPacketData_iter;
 
-    void handleEvent(senf::FileHandle, senf::Scheduler::EventId event);
+    void handleEvent(senf::Scheduler::EventId event);
     void handleTSPacket(senf::TransportPacket tsPacket);
     void handleSNDUPacket();
-    
+
     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 bool isSDNUPacketComplete();
     inline iterator::difference_type snduPacketBytesLeft();
-    
+
 };
 
 
-struct ULEdecException : public std::exception
+struct ULEdecException : public senf::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_;
+    ULEdecException(std::string const & what)
+        : senf::Exception(what) {}
 };
 
 
@@ -82,6 +79,6 @@ struct ULEdecException : public std::exception
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
-// compile-command: "scons -u test"
+// compile-command: "scons -u"
 // comment-column: 40
 // End: