X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibmarklin%2Flayout.h;h=2fc761aebb4aa972c020105e62a7bc626f6d346e;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=385a3cfab760e17d7beab074501e6d4cd3bf30ce;hpb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;p=r2c2.git

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index 385a3cf..2fc761a 100644
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -15,6 +15,7 @@ Distributed under the GPL
 
 namespace Marklin {
 
+class ArticleNumber;
 class Block;
 class Catalogue;
 class Driver;
@@ -35,9 +36,12 @@ public:
 		Loader(Layout &);
 	private:
 		virtual void finish();
+		void route();
 		void route(const std::string &);
 		void track(unsigned);
-		void train(unsigned, unsigned);
+		void track(ArticleNumber);
+		void train(unsigned, unsigned, const std::string &);
+		void train(ArticleNumber, unsigned, const std::string &);
 	};
 
 public:
@@ -50,17 +54,19 @@ public:
 	sigc::signal<void, Vehicle &> signal_vehicle_added;
 	sigc::signal<void, Vehicle &> signal_vehicle_removed;
 	sigc::signal<void, Block &, Train *> signal_block_reserved;
+	sigc::signal<void, const std::string &> signal_emergency;
 
 private:
 	Catalogue &catalogue;
 	Driver *driver;
 	std::string base;
 	std::set<Track *> tracks;
-	std::map<std::string, Route *> routes;
+	std::set<Route *> routes;
 	std::set<Block *> blocks;
 	std::map<unsigned, Train *> trains;
 	std::set<Vehicle *> vehicles;
 	Msp::Time::TimeStamp last_tick;
+	unsigned next_turnout_id;
 
 public:
 	Layout(Catalogue &, Driver * = 0);
@@ -74,18 +80,19 @@ public:
 	void add_track(Track &);
 	const std::set<Track *> &get_tracks() const { return tracks; }
 	void remove_track(Track &);
+	unsigned allocate_turnout_id(bool);
 
 	void add_block(Block &);
 	Block &get_block(unsigned) const;
-	Block &get_block_by_track(const Track &) const;
 	const std::set<Block *> &get_blocks() const { return blocks; }
 	void create_blocks();
-	void create_blocks(const Track &);
+	void create_blocks(Track &);
 	void remove_block(Block &);
 
 	void add_route(Route &);
-	const std::map<std::string, Route *> &get_routes() const { return routes; }
+	const std::set<Route *> &get_routes() const { return routes; }
 	Route &get_route(const std::string &) const;
+	void update_routes();
 	void remove_route(Route &);
 
 	void add_train(Train &);
@@ -97,12 +104,12 @@ public:
 	void remove_vehicle(Vehicle &);
 
 	void tick();
+	void emergency(const std::string &);
 
 	void save(const std::string &);
 	void save_trains(const std::string &);
 private:
-	void check_links();
-	void check_routes();
+	void sensor_event(unsigned, bool);
 };
 
 } // namespace Marklin