X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2Fpsi2tsModule%2Fpsi2ts.cc;h=55366cf9f05eff4dd424b0375ddab06ae239792a;hb=5d7f7add811bc8fa87b91653811583f9593aeea2;hp=3de7cab11c629877a1f88def26d011b25c783d65;hpb=3f0cb3ca7b09eb7733289c2a0576d36a3403a908;p=senf.git

diff --git a/Examples/psi2tsModule/psi2ts.cc b/Examples/psi2tsModule/psi2ts.cc
index 3de7cab..55366cf 100644
--- a/Examples/psi2tsModule/psi2ts.cc
+++ b/Examples/psi2tsModule/psi2ts.cc
@@ -1,4 +1,4 @@
-// $Id: Example.cc 661 2008-02-05 09:53:54Z tho $
+// $Id$
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
@@ -29,6 +29,7 @@
 // Custom includes
 
 //#include "psi2ts.cc.mpp"
+
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
@@ -42,31 +43,43 @@ namespace {
 }
 
 
-prefix_ Psi2TsModule::Psi2TsModule()
+prefix_ Psi2TsModule::Psi2TsModule(unsigned pid, senf::ClockService::clock_type timeout)
 {
+    pid_ = pid;
     continuity_counter_ = 0;
     state_ = IDLE;
     route( input, output );
     input.onRequest( &Psi2TsModule::onRequest );
+    timeout_ = timeout;
 }
-
+#include <senf/Utils/hexdump.hh>
 prefix_ void Psi2TsModule::onRequest()
 {
     senf::PacketData & section = input.read().data();
     iterator sec_end = section.end();
     iterator begin = section.begin();
     iterator end = section.begin();
-    advance_max( end, 184, sec_end);
-    
+    advance_max( end, 183, sec_end);
+
     do {
-        senf::TransportPacket tsPacket (senf::TransportPacket::create());
+        senf::TransportPacket tsPacket (senf::TransportPacket::create(188));
         tsPacket->continuity_counter() = next_continuity_counter();
+        tsPacket->pid() = pid_;
         if (state_ == IDLE) {
             state_ = PROC;
-            tsPacket->pusi() = true;
+            tsPacket->setPUSI(true);
+            tsPacket->pointer_field() = 0;
         }
-        senf::DataPacket::createAfter( tsPacket, boost::make_iterator_range(begin, end));
+        senf::PacketData & payloadData (tsPacket.next().data());
+        std::fill(
+                std::copy( begin, end, payloadData.begin() ),
+                payloadData.end(),
+                0xff
+        );
         tsPacket.finalize();
+
+        output.write( tsPacket);
+
         advance_max( begin, 184, sec_end);
         advance_max( end,   184, sec_end);
     } while (begin != end);