X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIntervalTimer.hh;h=959c48c220c0c816ca6d60c6353f3331483e21ec;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=5fe2aabf11d138750bfa54db481193b92a059186;hpb=e8b91aa6a817af6d9a3714e7b66be6c0d6b0a4e5;p=senf.git

diff --git a/PPI/IntervalTimer.hh b/PPI/IntervalTimer.hh
index 5fe2aab..959c48c 100644
--- a/PPI/IntervalTimer.hh
+++ b/PPI/IntervalTimer.hh
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -23,11 +23,11 @@
 /** \file
     \brief IntervalTimer public header */
 
-#ifndef HH_IntervalTimer_
-#define HH_IntervalTimer_ 1
+#ifndef HH_SENF_PPI_IntervalTimer_
+#define HH_SENF_PPI_IntervalTimer_ 1
 
 // Custom includes
-#include "Scheduler/ClockService.hh"
+#include "../Scheduler/ClockService.hh"
 #include "Events.hh"
 
 //#include "IntervalTimer.mpp"
@@ -64,12 +64,16 @@ namespace ppi {
         ///\name Structors and default members
         ///@{
 
-        explicit IntervalTimer(ClockService::clock_type interval, 
+        explicit IntervalTimer(ClockService::clock_type interval,
                                unsigned eventsPerInterval=1);
-
+        IntervalTimer();
+        
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
+        void interval(ClockService::clock_type interval, unsigned eventsPerInterval=1);
+        std::pair<ClockService::clock_type, unsigned> interval() const;
+
     protected:
 
     private:
@@ -82,7 +86,7 @@ namespace ppi {
         ClockService::clock_type interval_;
         unsigned eventsPerInterval_;
         IntervalTimerEventInfo info_;
-        unsigned id_;
+        scheduler::TimerEvent timer_;
     };
 
 }}