X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=bacb246f4dfd5f68a4dee346aa92abf5a85bebcf;hb=a448b6ac73e0eb19980e69b095136eabe95d2534;hp=65caa3f9fb245cf4c2ed47e8d71b214f03413e40;hpb=e6b7f8c4dd12199c3c5c0bec555fa73c87079729;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 65caa3f..bacb246 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -16,8 +16,10 @@ Distributed under the GPL
 namespace Marklin {
 
 class Locomotive;
+class Route;
 class Sensor;
 class TrafficManager;
+class Turnout;
 
 class Train: public sigc::trackable
 {
@@ -32,6 +34,7 @@ public:
 
 	sigc::signal<void, const std::string &> signal_name_changed;
 	sigc::signal<void, unsigned> signal_target_speed_changed;
+	sigc::signal<void, const Route *> signal_route_changed;
 	sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
@@ -57,7 +60,9 @@ private:
 	Locomotive &loco;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
+	Block *pending_block;
 	unsigned target_speed;
+	const Route *route;
 	Msp::Time::TimeStamp try_reserve;
 	std::string status;
 
@@ -78,9 +83,11 @@ public:
 	void set_name(const std::string &);
 	void set_speed(unsigned);
 	void set_reverse(bool);
+	void set_route(const Route *);
 	const std::string &get_name() const { return name; }
 	Locomotive &get_locomotive() const { return loco; }
 	unsigned get_target_speed() const { return target_speed; }
+	const Route *get_route() const { return route; }
 	const std::string &get_status() const { return status; }
 	const Point &get_position() const { return pos; }
 	void place(Block *, unsigned);
@@ -90,8 +97,8 @@ public:
 private:
 	void locomotive_reverse_changed(bool);
 	void sensor_event(bool, Sensor *);
-	void turnout_route_changing(unsigned, Turnout *);
-	void turnout_route_changed(unsigned, Turnout *);
+	void turnout_path_changing(unsigned, Turnout *);
+	void turnout_path_changed(unsigned, Turnout *);
 	unsigned reserve_more();
 	void update_speed();
 	float get_real_speed(unsigned) const;