X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=5ef23537a4710b9f3e4e8832f9056d73c10e2813;hb=025c23f199c411cc2ec1a6d2e85bf24460150ceb;hp=90627ae4561d021dc372ac8fe3090a1a94794677;hpb=7587f018794f53974409a2aad76a0a421cea2d24;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 90627ae..5ef2353 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -26,10 +26,16 @@ 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;
@@ -60,6 +66,7 @@ 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;
@@ -89,8 +96,10 @@ public:
 	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:
@@ -104,7 +113,8 @@ private:
 	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 reverse_blocks(std::list<BlockRef> &) const;
 };
 
 } // namespace Marklin