Packets/80221Bundle: fixed MIH message validation unit test @ ubuntu hardy

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

diff --git a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh
index e6cf65e..ca47c00 100644 (file)
--- a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh
+++ b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh
@@ -25,10 +25,11 @@
 #define HH_SENF_Socket_Protocols_DVB_DVBProtocolWrapper_ 1
 
 // Custom includes
-#include <senf/Utils/Console/Console.hh>
+#include <senf/Utils/Console/ScopedDirectory.hh>
+#include <senf/Utils/Console/Traits.hh>
 #include "DVBDemuxHandles.hh"
 
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 SENF_CONSOLE_REGISTER_ENUM( dmx_input_t, (DMX_IN_FRONTEND)(DMX_IN_DVR) );
 SENF_CONSOLE_REGISTER_ENUM( dmx_output_t, (DMX_OUT_DECODER)(DMX_OUT_TAP)(DMX_OUT_TS_TAP) );
@@ -43,7 +44,7 @@ namespace senf {
     /** \brief Helperclass for configuration and controlling DVB protocol handles.
 
      */
-    class DVBSectionProtocolWrapper : public DVBProtocolWrapper 
+    class DVBSectionProtocolWrapper : public DVBProtocolWrapper
     {
     private:
         const DVBDemuxSectionSocketProtocol& protocol;
@@ -57,11 +58,11 @@ namespace senf {
 
         DVBSectionProtocolWrapper(senf::DVBDemuxSectionHandle sh);
         ~DVBSectionProtocolWrapper() { }
-        
+
         void setSectionFilter(unsigned short int pid, u_int8_t filter,
                 unsigned int flags, u_int8_t mask, u_int8_t mode, unsigned int timeout);
 
-        void setBufferSize(unsigned long size); 
+        void setBufferSize(unsigned long size);
                                 ///< Set the size of the circular buffer used for filtered data.
                                 /**< The default size is two maximum sized sections, i.e. if
                                      this function is not called a buffer size of 2 * 4096 bytes
@@ -70,16 +71,16 @@ namespace senf {
         void startFiltering();  ///< Starts filtering
         void stopFiltering();   ///< Stops filtering
     };
-    
+
     SENF_CONSOLE_REGISTER_ENUM_MEMBER(DVBSectionProtocolWrapper, Flags,
             (CHECK_CRC)(ONESHOT)(IMMEDIATE_START)(KERNEL_CLIENT));
 
-    
+
     class DVBPESProtocolWrapper : public senf::DVBProtocolWrapper
     {
     private:
         const senf::DVBDemuxPESSocketProtocol& protocol;
-    
+
     public:
         enum Flags {CHECK_CRC = DMX_CHECK_CRC,
             ONESHOT = DMX_ONESHOT,
@@ -95,12 +96,12 @@ namespace senf {
         void startFiltering(); ///< Starts filtering
         void stopFiltering();  ///< Stops filtering
     };
-    
+
     SENF_CONSOLE_REGISTER_ENUM_MEMBER(DVBPESProtocolWrapper, Flags,
             (CHECK_CRC)(ONESHOT)(IMMEDIATE_START)(KERNEL_CLIENT));
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "DVBProtocolWrapper.cci"
 //#include "DVBProtocolWrapper.ct"
 //#include "DVBProtocolWrapper.cti"