X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FDVBAdapter%2FMPEdec.cc;h=1f269d42f82e1defa7b484ae7a2869825cd3840b;hb=6df7613bc4c5a8c27a6af11450d2cb8fbb6ea3a6;hp=9abf13cff4d0b10be63e864a18d960cb24fb5ee9;hpb=e67faa588ac375105c0a6d12c79ef93d5499bcab;p=senf.git

diff --git a/Examples/DVBAdapter/MPEdec.cc b/Examples/DVBAdapter/MPEdec.cc
index 9abf13c..1f269d4 100644
--- a/Examples/DVBAdapter/MPEdec.cc
+++ b/Examples/DVBAdapter/MPEdec.cc
@@ -1,24 +1,30 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
 //
-// 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>
+
 
 // Definition of non-inline non-template functions
 
@@ -27,11 +33,11 @@
 #include <iomanip>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
-#include <linux/dvb/dmx.h> 
+#include <linux/dvb/dmx.h>
 
 #include <senf/Scheduler/Scheduler.hh>
 #include <senf/Packets/DefaultBundle/EthernetPacket.hh>
-#include <senf/Packets/MPEGDVBBundle/DatagramSection.hh>
+#include <senf/Packets/MPEGDVBBundle/MPESection.hh>
 #include <senf/Utils/membind.hh>
 #include <senf/Utils/hexdump.hh>
 #include <senf/Socket/Protocols/DVB.hh>
@@ -40,7 +46,7 @@
 #define PID 500
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 class MySniffer
 {
@@ -48,7 +54,7 @@ class MySniffer
 
 public:
     MySniffer(unsigned short adapter=0, unsigned short device=0)
-        : handle( adapter, device ) 
+        : handle( adapter, device )
     {
         struct dmx_sct_filter_params sec_filter;
         memset(&sec_filter, 0, sizeof (struct dmx_sct_filter_params));
@@ -59,7 +65,7 @@ public:
         sec_filter.flags |= DMX_CHECK_CRC;
 
         handle.protocol().setSectionFilter( &sec_filter );
-        
+
         senf::Scheduler::instance().add(
             handle, senf::membind(&MySniffer::dumpSection, this));
     }
@@ -68,7 +74,7 @@ private:
     void dumpSection(senf::Scheduler::EventId event)
     {
         std::string data (handle.read());
-        senf::DatagramSection section (senf::DatagramSection::create(data));
+        senf::MPESection section (senf::MPESection::create(data));
         section.dump(std::cout);
         senf::PacketData & datagramData (section.next().data());
         senf::hexdump(datagramData.begin(), datagramData.end(), std::cout);
@@ -88,7 +94,7 @@ int main(int argc, char const * argv[])
 }
 
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_