senfscons: Fix 'Object' build helper to work with empty source list in SCons 0.96.1

[senf.git] / Examples / RateStuffer / ratestuffer.cc

diff --git a/Examples/RateStuffer/ratestuffer.cc b/Examples/RateStuffer/ratestuffer.cc
index 9ae6bc9..631210e 100644 (file)
--- a/Examples/RateStuffer/ratestuffer.cc
+++ b/Examples/RateStuffer/ratestuffer.cc
@@ -63,7 +63,7 @@ RateFilter::RateFilter(senf::ClockService::clock_type interval)
 {
     route(input,timer);
     route(timer,output);
-    registerEvent(&RateFilter::timeout, timer);
+    registerEvent(timer, &RateFilter::timeout);
 }
 
 void RateFilter::timeout()
@@ -117,8 +117,8 @@ public:
 //                   +----------------------------------------------------+
 //                   | stuffer                                            |
 //                   |                                                    |
-// [ udpReader ] O-->:---> [ queue ] -->O [      ]                        |
-//                   |                    [ join ] -->O [ rateFilter] O-->:O--> [ udpWriter ]
+// [ udpSource ] O-->:---> [ queue ] -->O [      ]                        |
+//                   |                    [ join ] -->O [ rateFilter] O-->:O--> [ udpSink ]
 //                   | [ generator ] -->O [      ]                        |
 //                   |                                                    |
 //                   +----------------------------------------------------+
@@ -131,14 +131,14 @@ int main(int argc, char * argv[])
     senf::ConnectedUDPv4ClientSocketHandle outputSocket(
         senf::INet4SocketAddress("localhost:44345"));
 
-    module::ActiveSocketReader<>  udpReader  ( inputSocket );
+    module::ActiveSocketSource<>  udpSource  ( inputSocket );
     RateStuffer                   stuffer    ( 1000000000ul, 
                                                senf::DataPacket::create(std::string("<idle>\n")),
                                                2u, 1u );
-    module::PassiveSocketWriter<> udpWriter  ( outputSocket );
+    module::PassiveSocketSink<> udpSink  ( outputSocket );
 
-    ppi::connect( udpReader, stuffer   );
-    ppi::connect( stuffer,   udpWriter );
+    ppi::connect( udpSource, stuffer   );
+    ppi::connect( stuffer,   udpSink );
 
     ppi::run();