X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=3fc71316371bb5fb3a11d59ddb434005bccdc174;hb=93ca5f1774e218c313edd88024f82c80714d8e7c;hp=b891a660ac4e8ca381947421a7bc73c3c6b4397d;hpb=684cf3b8c41e9bb60b2d286bd6d632b0c5abf0ab;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index b891a66..3fc7131 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -16,6 +16,7 @@ Distributed under the GPL
 namespace Marklin {
 
 class Locomotive;
+class Route;
 class Sensor;
 class TrafficManager;
 class Turnout;
@@ -33,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:
@@ -58,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;
 
@@ -79,13 +83,16 @@ 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);
 	bool free_block(Block *);
+	int get_entry_to_block(Block *) const;
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private: