X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=568d1736dbd85228d707559aed803f0056e546fa;hb=25b79ab38c2be2e5c89b8240504f641fd9c4899c;hp=4a22aa97862bfc2019890aefc8090f83e7114ea9;hpb=06c100aacb559fbbe7380e15981c4772092c269b;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index 4a22aa9..568d173 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -15,37 +15,40 @@ class Block
 public:
 	struct Endpoint
 	{
-		Track *track;
-		const Track::Endpoint *track_ep;
-		Block  *link;
+		Track    *track;
+		unsigned track_ep;
+		Block    *link;
 		unsigned routes;
 
-		Endpoint(Track *, const Track::Endpoint *);
+		Endpoint(Track *, unsigned);
 	};
-	typedef std::list<Endpoint> EndpointSeq;
 
-	Block(TrafficManager &, Track *);
-	unsigned get_sensor_id() const { return sensor_id; }
-	const TrackSet &get_tracks() const { return tracks; }
-	const EndpointSeq &get_endpoints() const { return endpoints; }
-	const Endpoint *get_endpoint_by_link(const Block *) const;
-	const Endpoint *traverse(const Endpoint *) const;
-	void check_link(Block &);
-	bool reserve(const Train *);
-	void print_debug();
 private:
 	TrafficManager &trfc_mgr;
 	unsigned       id;
 	unsigned       sensor_id;
-	TrackSet       tracks;
-	EndpointSeq    endpoints;
+	std::set<Track *>     tracks;
+	std::vector<Endpoint> endpoints;
 	const Train    *train;
 
-	void find_routes(Track *, const Track::Endpoint *, unsigned, TrackSet &);
+public:
+	Block(TrafficManager &, Track &);
+
+	unsigned get_sensor_id() const { return sensor_id; }
+	const std::set<Track *> &get_tracks() const { return tracks; }
+	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
+	int get_endpoint_by_link(const Block &) const;
+	int traverse(unsigned, float * =0) const;
+	void check_link(Block &);
+	Block *get_link(unsigned) const;
+	bool reserve(const Train *);
+	const Train *get_train() const { return train; }
+	void print_debug();
+private:
+	void find_routes(Track &, unsigned, unsigned, std::set<Track *> &);
 
 	static unsigned next_id;
 };
-typedef std::list<Block *> BlockSeq;
 
 } // namespace Marklin