X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fturnout.h;h=01d37377dd8603a695c16e8151b94562ea77aa88;hb=6dc18b0e518407bd2a86602bae1e9bbae05da7c8;hp=0928eadc445e48311b9c075a4b483e8374b77c20;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/turnout.h b/source/libmarklin/turnout.h
index 0928ead..01d3737 100644
--- a/source/libmarklin/turnout.h
+++ b/source/libmarklin/turnout.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -17,25 +17,29 @@ Distributed under the GPL
 namespace Marklin {
 
 class Control;
+class Reply;
 
 class Turnout
 {
+public:
+	sigc::signal<void, unsigned> signal_path_changing;
+	sigc::signal<void, unsigned> signal_path_changed;
+
 private:
-	Control  &control;
+	Control &control;
 	unsigned addr;
-	unsigned route;
+	unsigned path;
+	bool dual;
 
 public:
-	sigc::signal<void, unsigned> signal_route_changed;
-
-	Turnout(Control &, unsigned);
+	Turnout(Control &, unsigned, bool =false);
 
-	void     set_route(unsigned);
+	void set_path(unsigned);
 	unsigned get_address() const { return addr; }
-	unsigned get_route() const   { return route; }
+	unsigned get_path() const { return path; }
 private:
 	void command(bool);
-	void status_reply(Error, const std::string &);
+	void status_reply(const Reply &, bool);
 	bool switch_timeout();
 	void turnout_event(unsigned, bool);
 };