X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FDVB%2FDVBDemuxHandles.cc;h=6cbbe7d10313af643be3ff5388375c67df2defdd;hb=72cc548dfc3fa72d14d4d8c1a178f162165e933a;hp=f71251e0d3f0a10c2f2a7e90609bec0696ab4004;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc b/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc
index f71251e..6cbbe7d 100644
--- a/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc
+++ b/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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
-// 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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief DVBDemuxHandles non-inline non-template implementation */
@@ -31,14 +36,14 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include "../../../Utils/Exception.hh"
+#include <senf/Utils/Exception.hh>
 
 
 //#include "DVBDemuxHandles.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::DVBDemuxHandles
 
 prefix_ void senf::DVBDemuxSectionSocketProtocol::init_client(unsigned short adapter, unsigned short device)
@@ -46,7 +51,7 @@ prefix_ void senf::DVBDemuxSectionSocketProtocol::init_client(unsigned short ada
 {
     std::string devDemux = str( boost::format("/dev/dvb/adapter%d/demux%d") % adapter % device);
     int f = open(devDemux.c_str(), O_RDONLY | O_NONBLOCK);
-    if (f < 0){
+    if (f < 0) {
         SENF_THROW_SYSTEM_EXCEPTION("Could not open demux device of DVB adapter ") << devDemux << ".";
     }
     fd(f);
@@ -68,7 +73,7 @@ prefix_ void senf::DVBDemuxSectionSocketProtocol::setSectionFilter(unsigned shor
     sec_filter.filter.mask[0] = mask;
     sec_filter.filter.mode[0] = mode;
     sec_filter.flags = flags;
-       
+
     if (::ioctl(fd(), DMX_SET_FILTER, &sec_filter) < 0)
         SENF_THROW_SYSTEM_EXCEPTION("Could not set section filter of DVB adapter.");
 }
@@ -95,7 +100,7 @@ prefix_ unsigned senf::DVBDemuxPESSocketProtocol::available()
 prefix_ void senf::DVBDemuxPESSocketProtocol::setPESFilter(unsigned short int pid, dmx_input_t input, dmx_output_t output, dmx_pes_type_t pesType, unsigned int flags)
     const
 {
-   
+
     struct dmx_pes_filter_params pes_filter;
         ::memset(&pes_filter, 0, sizeof(struct dmx_pes_filter_params));
         pes_filter.pid = pid;
@@ -103,7 +108,7 @@ prefix_ void senf::DVBDemuxPESSocketProtocol::setPESFilter(unsigned short int pi
         pes_filter.output = output;
         pes_filter.pes_type = pesType;
         pes_filter.flags = flags;
-        
+
     if (::ioctl(fd(), DMX_SET_PES_FILTER, &pes_filter) < 0)
         SENF_THROW_SYSTEM_EXCEPTION("Could not set PES filter of DVB adapter.");
 }
@@ -127,7 +132,7 @@ prefix_ unsigned senf::DVBDvrSocketProtocol::available()
     return 188;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "DVBDemuxHandles.mpp"