Move double-address logic to drivers

[r2c2.git] / source / libr2c2 / driver.h

diff --git a/source/libr2c2/driver.h b/source/libr2c2/driver.h
index d9d11270eb697c5d4155d6eb87026c535b1839b6..e8d27f0b5cc58864e781a880e42a9a3774ae093c 100644 (file)
--- a/source/libr2c2/driver.h
+++ b/source/libr2c2/driver.h
@@ -13,6 +13,9 @@ Distributed under the GPL
 
 namespace R2C2 {
 
+class TrackType;
+class VehicleType;
+
 class Driver
 {
 public:
@@ -20,7 +23,7 @@ public:
        sigc::signal<void, bool> signal_halt;
        sigc::signal<void, unsigned, unsigned, bool> signal_loco_speed;
        sigc::signal<void, unsigned, unsigned, bool> signal_loco_function;
-       sigc::signal<void, unsigned, bool> signal_turnout;
+       sigc::signal<void, unsigned, unsigned> signal_turnout;
        sigc::signal<void, unsigned, bool> signal_sensor;
 
 protected:
@@ -35,14 +38,14 @@ public:
 
        virtual const char *enumerate_protocols(unsigned) const = 0;
        virtual unsigned get_protocol_speed_steps(const std::string &) const = 0;
-       virtual void add_loco(unsigned, const std::string &) = 0;
+       virtual void add_loco(unsigned, const std::string &, const VehicleType &) = 0;
        virtual void set_loco_speed(unsigned, unsigned) = 0;
        virtual void set_loco_reverse(unsigned, bool) = 0;
        virtual void set_loco_function(unsigned, unsigned, bool) = 0;
 
-       virtual void add_turnout(unsigned) = 0;
-       virtual void set_turnout(unsigned, bool) = 0;
-       virtual bool get_turnout(unsigned) const = 0;
+       virtual void add_turnout(unsigned, const TrackType &) = 0;
+       virtual void set_turnout(unsigned, unsigned) = 0;
+       virtual unsigned get_turnout(unsigned) const = 0;
 
        virtual void add_sensor(unsigned) = 0;
        virtual void set_sensor(unsigned, bool) = 0;