X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrafficmanager.h;h=85381e0f4454bdb2f05ef3b47d78831c9abf607b;hb=010d8321e982d1684fcbff5bf6fc2bdec7cb7bae;hp=11ecc9551b3a013aff96e86d9ffc7cc614ec9336;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/libmarklin/trafficmanager.h b/source/libmarklin/trafficmanager.h
index 11ecc95..85381e0 100644
--- a/source/libmarklin/trafficmanager.h
+++ b/source/libmarklin/trafficmanager.h
@@ -1,7 +1,14 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_TRAFFICMANAGER_H_
 #define LIBMARKLIN_TRAFFICMANAGER_H_
 
-#include "section.h"
+#include "block.h"
 #include "train.h"
 
 namespace Marklin {
@@ -13,16 +20,37 @@ class Turnout;
 class TrafficManager
 {
 public:
-	TrafficManager(Control &, Layout &);
-	Control &get_control() const { return control; }
-	Section *get_section_by_track(const Track *) const;
-	void add_train(Train *);
+	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;
-	SectionSeq sections;
-	TrainSeq trains;
+	std::list<Block *> blocks;
+	std::list<Train *> trains;
+	Msp::Time::TimeStamp last_tick;
 
+public:
+	TrafficManager(Control &, Layout &);
+	~TrafficManager();
+
+	Control &get_control() const { return control; }
+	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 *);
 };