X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fdummy.h;h=2c6f992c64d05ee5ca7cba8456093abdebe6d0db;hb=5c1ddd2f213af3fea15237e02f7da112c0abba36;hp=5357bbd7bad9726bb1d11f89562a65074d531c3a;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/dummy.h b/source/libr2c2/dummy.h
index 5357bbd..2c6f992 100644
--- a/source/libr2c2/dummy.h
+++ b/source/libr2c2/dummy.h
@@ -1,14 +1,9 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_DUMMY_H_
 #define LIBR2C2_DUMMY_H_
 
 #include <map>
+#include <msp/time/timedelta.h>
+#include <msp/time/timestamp.h>
 #include "driver.h"
 
 namespace R2C2 {
@@ -16,6 +11,13 @@ namespace R2C2 {
 class Dummy: public Driver
 {
 private:
+	struct TurnoutState
+	{
+		unsigned state;
+		unsigned pending;
+		Msp::Time::TimeStamp timeout;
+	};
+
 	struct LocoState
 	{
 		unsigned speed;
@@ -23,12 +25,13 @@ private:
 	};
 
 	bool power;
-	std::map<unsigned, bool> turnouts;
+	std::map<unsigned, TurnoutState> turnouts;
 	std::map<unsigned, LocoState> locos;
 	std::map<unsigned, bool> sensors;
+	Msp::Time::TimeDelta turnout_delay;
 
 public:
-	Dummy();
+	Dummy(const std::string &);
 
 	virtual void set_power(bool);
 	virtual bool get_power() const { return power; }
@@ -37,20 +40,24 @@ public:
 
 	virtual const char *enumerate_protocols(unsigned) const;
 	virtual unsigned get_protocol_speed_steps(const std::string &) const;
-	virtual void add_loco(unsigned, const std::string &) { }
+	virtual void add_loco(unsigned, const std::string &, const VehicleType &) { }
 	virtual void set_loco_speed(unsigned, unsigned);
 	virtual void set_loco_reverse(unsigned, bool);
 	virtual void set_loco_function(unsigned, unsigned, bool);
 
-	virtual void add_turnout(unsigned);
-	virtual void set_turnout(unsigned, bool);
-	virtual bool get_turnout(unsigned) const;
+	virtual void add_turnout(unsigned, const TrackType &);
+	virtual void set_turnout(unsigned, unsigned);
+	virtual unsigned get_turnout(unsigned) const;
+
+	virtual void add_signal(unsigned, const SignalType &) { }
+	virtual void set_signal(unsigned, unsigned) { }
+	virtual unsigned get_signal(unsigned) const { return 0; }
 
 	virtual void add_sensor(unsigned) { }
 	virtual void set_sensor(unsigned, bool);
 	virtual bool get_sensor(unsigned) const;
 
-	virtual void tick() { }
+	virtual void tick();
 	virtual void flush() { }
 };