X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibmarklin%2Ftrafficmanager.h;h=85381e0f4454bdb2f05ef3b47d78831c9abf607b;hb=010d8321e982d1684fcbff5bf6fc2bdec7cb7bae;hp=293783f112d8f914dcc027c903c16c4b8d1ae841;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/trafficmanager.h b/source/libmarklin/trafficmanager.h
index 293783f..85381e0 100644
--- a/source/libmarklin/trafficmanager.h
+++ b/source/libmarklin/trafficmanager.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -19,15 +19,26 @@ class Turnout;
 
 class TrafficManager
 {
+public:
+	class Loader: public Msp::DataFile::BasicLoader<TrafficManager>
+	{
+	public:
+		Loader(TrafficManager &);
+	private:
+		void train(unsigned, unsigned);
+	};
+
+	sigc::signal<void, Train &> signal_train_added;
+	sigc::signal<void, const Block &, const Train *> signal_block_reserved;
+
 private:
 	Control &control;
 	Layout &layout;
 	std::list<Block *> blocks;
 	std::list<Train *> trains;
+	Msp::Time::TimeStamp last_tick;
 
 public:
-	sigc::signal<void, const Block &, const Train *> signal_block_reserved;
-
 	TrafficManager(Control &, Layout &);
 	~TrafficManager();
 
@@ -35,8 +46,10 @@ public:
 	const std::list<Block *> &get_blocks() const { return blocks; }
 	Block &get_block_by_track(const Track &) const;
 	const std::list<Train *> &get_trains() const { return trains; }
+	Train &get_train_by_locomotive(const Locomotive &) const;
 	void add_train(Train *);
 	void tick();
+	void save(const std::string &) const;
 private:
 	void turnout_route_changed(unsigned, Turnout *);
 };