X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=4e8734fdb2d3411979ab64f844f4f786c8644613;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=b891a660ac4e8ca381947421a7bc73c3c6b4397d;hpb=684cf3b8c41e9bb60b2d286bd6d632b0c5abf0ab;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index b891a66..4e8734f 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;
@@ -25,14 +26,21 @@ class Train: public sigc::trackable
 public:
 	class Loader: public Msp::DataFile::BasicLoader<Train>
 	{
+	private:
+		Block *prev_block;
+
 	public:
 		Loader(Train &);
 	private:
+		void block(unsigned);
+		void block_hint(unsigned);
 		void real_speed(unsigned, float, float);
+		void route(const std::string &);
 	};
 
 	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,8 +66,9 @@ private:
 	Locomotive &loco;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
+	Block *pending_block;
 	unsigned target_speed;
-	Msp::Time::TimeStamp try_reserve;
+	const Route *route;
 	std::string status;
 
 	Msp::Time::TimeStamp last_entry_time;
@@ -79,13 +88,17 @@ 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 *);
+	void place(Block &, unsigned);
+	bool is_placed() const { return !cur_blocks.empty(); }
+	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:
@@ -93,13 +106,16 @@ private:
 	void sensor_event(bool, Sensor *);
 	void turnout_path_changing(unsigned, Turnout *);
 	void turnout_path_changed(unsigned, Turnout *);
+	void block_reserved(const Block &, const Train *);
 	unsigned reserve_more();
 	void update_speed();
 	float get_real_speed(unsigned) const;
 	unsigned find_speed(float) const;
 	void set_status(const std::string &);
 	void set_position(const Block::Endpoint &);
-	void release_reserved_blocks();
+	void release_blocks(std::list<BlockRef> &);
+	void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);
+	void reverse_blocks(std::list<BlockRef> &) const;
 };
 
 } // namespace Marklin