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

diff --git a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cci b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cci
index 7f653f2..0e5f503 100644
--- a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cci
+++ b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cci
@@ -2,35 +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>
 /** \file
     \brief DVBSocketController inline non-template implementation */
 
 // Custom includes
 
-#define prefix_ inline 
-///////////////////////////////cci.p////////////////////////////////////////
+#define prefix_ inline
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ void senf::DVBSectionProtocolWrapper::setSectionFilter(
-        unsigned short int pid, u_int8_t filter, unsigned int flags, u_int8_t mask, 
-        u_int8_t mode, unsigned int timeout) 
+        unsigned short int pid, u_int8_t filter, unsigned int flags, u_int8_t mask,
+        u_int8_t mode, unsigned int timeout)
 {
     protocol.setSectionFilter(pid, timeout, flags, filter, mask, mode);
 }
@@ -52,7 +56,7 @@ prefix_ void senf::DVBSectionProtocolWrapper::stopFiltering()
 
 
 prefix_ void senf::DVBPESProtocolWrapper::setPESFilter(unsigned short int pid, dmx_input_t input,
-        dmx_output_t output, dmx_pes_type_t pesType, unsigned int flags) 
+        dmx_output_t output, dmx_pes_type_t pesType, unsigned int flags)
 {
     protocol.setPESFilter(pid, input, output, pesType, flags);
 }
@@ -68,5 +72,5 @@ prefix_ void senf::DVBPESProtocolWrapper::stopFiltering()
 }
 
 
-///////////////////////////////cci.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_