X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FDVB%2FDVBProtocolWrapper.hh;h=2afaeabaf4ee274146c416a9d2aa9179e3caf8c4;hb=72cc548dfc3fa72d14d4d8c1a178f162165e933a;hp=e6cf65e0361481fff0e6b849db6da951e16e5d99;hpb=7f1e38e4538c40325566e9fe3f12bf10c3ed3b93;p=senf.git

diff --git a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh
index e6cf65e..2afaeab 100644
--- a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh
+++ b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh
@@ -2,33 +2,39 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Anton Gillert <atx@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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Anton Gillert <atx@berlios.de>
 
 
 #ifndef HH_SENF_Socket_Protocols_DVB_DVBProtocolWrapper_
 #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 +49,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 +63,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 +76,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 +101,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"