switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / Examples / psi2tsModule / psi2ts.hh

diff --git a/Examples/psi2tsModule/psi2ts.hh b/Examples/psi2tsModule/psi2ts.hh
index 52ccdd1..da9e5fd 100644 (file)
--- a/Examples/psi2tsModule/psi2ts.hh
+++ b/Examples/psi2tsModule/psi2ts.hh
@@ -1,30 +1,35 @@
-// $Id: Example.hh 661 2008-02-05 09:53:54Z tho $
+// $Id$
 //
 // Copyright (C) 2008
 // 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 psi2ts.hh public header */
 
-#ifndef HH_psi2ts_
-#define HH_psi2ts_ 1
+#ifndef HH_SENF_Examples_psi2tsModule_psi2ts_
+#define HH_SENF_Examples_psi2tsModule_psi2ts_ 1
 
 // Custom includes
 #include <senf/PPI/PPI.hh>
@@ -34,30 +39,31 @@
 #include <senf/Packets/MPEGDVBBundle/TransportPacket.hh>
 
 //#include "psi2ts.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 class Psi2TsModule
     : public senf::ppi::module::Module
 {
     SENF_PPI_MODULE(Psi2TsModule);
 
-public: 
+public:
     senf::ppi::connector::PassiveInput<> input;
     senf::ppi::connector::ActiveOutput<senf::TransportPacket> output;
-    Psi2TsModule(); 
+    Psi2TsModule(unsigned pid, senf::ClockService::clock_type timout=0);
     void onRequest();
-    
+
 private:
     enum state {IDLE, PROC, WAIT};
     typedef senf::PacketData::iterator iterator;
     unsigned continuity_counter_;
     unsigned next_continuity_counter();
     state state_;
-        
+    unsigned pid_;
+    senf::ClockService::clock_type timeout_;
 };
 
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "psi2ts.cci"
 //#include "psi2ts.ct"
 //#include "psi2ts.cti"