Please use spaces instead of tabs!

[senf.git] / Socket / Protocols / DVB / DVBFrontendHandle.hh

diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.hh b/Socket/Protocols/DVB/DVBFrontendHandle.hh
index c1f628c..3c783c3 100644 (file)
--- a/Socket/Protocols/DVB/DVBFrontendHandle.hh
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.hh
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@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
@@ -27,14 +27,13 @@
 #define HH_DVBFrontendHandle_ 1
 
 // Custom includes
-#include "Socket/BufferingPolicy.hh"
-#include "Socket/FramingPolicy.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/ReadWritePolicy.hh"
-#include "Socket/ProtocolClientSocketHandle.hh"
-#include "Socket/SocketProtocol.hh"
-
+#include <boost/cstdint.hpp>
 #include <linux/dvb/frontend.h> 
+#include "../../../Socket/FramingPolicy.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/ReadWritePolicy.hh"
+#include "../../../Socket/ProtocolClientSocketHandle.hh"
+#include "../../../Socket/SocketProtocol.hh"
 
 //#include "DVBFrontendHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -45,18 +44,17 @@ namespace senf {
     /// @{
 
     typedef MakeSocketPolicy<
-       NoAddressingPolicy,
+        NoAddressingPolicy,
         DatagramFramingPolicy,
         UnconnectedCommunicationPolicy,
         NotReadablePolicy,
-        NotWriteablePolicy,
-        NoBufferingPolicy
+        NotWriteablePolicy
         >::policy DVBFrontend_Policy;   ///< Socket Policy for xxxx
 
     /** \brief xxx
      */
     class DVBFrontendProtocol
-        : public ConcreteSocketProtocol<DVBFrontend_Policy>
+        : public ConcreteSocketProtocol<DVBFrontend_Policy, DVBFrontendProtocol>
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
@@ -65,7 +63,7 @@ namespace senf {
         ///\name Constructors
         ///@{
 
-        void init_client() const;       ///< xxx
+        void init_client(boost::uint8_t adapter=0, boost::uint8_t device=0) const;       ///< xxx
                                         /**< \note This member is implicitly called from the
                                              ProtocolClientSocketHandle::ProtocolClientSocketHandle()
                                              constructor */
@@ -77,8 +75,6 @@ namespace senf {
         unsigned available() const;
         bool eof() const;
 
-        std::auto_ptr<SocketProtocol> clone() const;
-
         ///@}
         
         void signalStrength(int16_t *strength) const;