Forgot to add the new files

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

diff --git a/source/libmarklin/turnout.h b/source/libmarklin/turnout.h
index 279571499e5ce0c2bb3f4e2ba64b31167fa60b19..c7a603c78e53db9224b75951aa3474d107c62338 100644 (file)
--- a/source/libmarklin/turnout.h
+++ b/source/libmarklin/turnout.h
@@ -22,25 +22,28 @@ class Reply;
 class Turnout
 {
 public:
-       sigc::signal<void, unsigned> signal_route_changing;
-       sigc::signal<void, unsigned> signal_route_changed;
+       sigc::signal<void, unsigned> signal_path_changing;
+       sigc::signal<void, unsigned> signal_path_changed;
 
 private:
        Control &control;
        unsigned addr;
-       unsigned route;
+       unsigned char path;
+       unsigned char pending_path;
+       unsigned char pending_cmds;
        bool dual;
+       bool on;
 
 public:
        Turnout(Control &, unsigned, bool =false);
 
-       void set_route(unsigned);
+       void set_path(unsigned char);
        unsigned get_address() const { return addr; }
-       unsigned get_route() const { return route; }
+       unsigned char get_path() const { return path; }
 private:
-       void command(bool);
-       void status_reply(const Reply &, bool);
-       bool switch_timeout();
+       void command(unsigned char);
+       void command_reply(const Reply &, unsigned char);
+       void status_reply(const Reply &, unsigned char);
        void turnout_event(unsigned, bool);
 };