Fix memory leaks and other bad stuff

[r2c2.git] / source / libmarklin / sensor.h

diff --git a/source/libmarklin/sensor.h b/source/libmarklin/sensor.h
index e5e1b43eea2dde6be8ebb2e295c7e71ad00c889f..45749ea28c142fe338436c378681b94a41fd0735 100644 (file)
--- a/source/libmarklin/sensor.h
+++ b/source/libmarklin/sensor.h
@@ -1,9 +1,17 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2007-2008  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_SENSOR_H_
 #define LIBMARKLIN_SENSOR_H_
 
 #include <list>
 #include <map>
-#include <sigc++/sigc++.h>
+#include <sigc++/signal.h>
+#include <msp/time/timestamp.h>
 
 namespace Marklin {
 
@@ -14,18 +22,21 @@ class Sensor
 public:
        sigc::signal<void, bool> signal_state_changed;
 
-       Sensor(Control &, unsigned);
-       unsigned get_address() const { return addr; }
-       bool     get_state() const   { return state; }
 private:
-       Control  &control;
+       Control &control;
        unsigned addr;
-       bool     state;
+       bool state;
+       Msp::Time::TimeStamp off_timeout;
 
+public:
+       Sensor(Control &, unsigned);
+
+       unsigned get_address() const { return addr; }
+       bool get_state() const { return state; }
+       void tick();
+private:
        void sensor_event(unsigned, bool);
 };
-typedef std::list<Sensor *> SensorSeq;
-typedef std::map<unsigned, Sensor *> SensorMap;
 
 } // namespace Marklin