X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.h;h=bcb76e143635fa4b0180f24e698dfee292509bef;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=f5b760265b5b30159fe44e2103ffe7691af81850;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/libmarklin/route.h b/source/libmarklin/route.h
index f5b7602..bcb76e1 100644
--- a/source/libmarklin/route.h
+++ b/source/libmarklin/route.h
@@ -1,27 +1,55 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2007-2009  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_ROUTE_H_
 #define LIBMARKLIN_ROUTE_H_
 
-#include <list>
+#include <map>
+#include <set>
 #include <string>
-#include "track.h"
+#include <msp/datafile/loader.h>
 
 namespace Marklin {
 
+class Layout;
+class Track;
+class Turnout;
+
 class Route
 {
 public:
-	typedef std::map<unsigned, unsigned> TurnoutMap;
+	class Loader: public Msp::DataFile::BasicLoader<Route>
+	{
+	public:
+		Loader(Route &);
+	private:
+		void turnout(unsigned, unsigned);
+	};
 
-	Route();
-	const TurnoutMap &get_turnouts() const { return turnouts; }
-	void add_track(Track *);
-	~Route();
 private:
 	std::string name;
-	TrackSeq    tracks;
-	TurnoutMap  turnouts;
+	std::set<const Track *> tracks;
+	std::map<unsigned, int> turnouts;
+
+public:
+	Route(Layout &, const std::string &);
+
+	const std::string &get_name() const { return name; }
+	int get_turnout(unsigned) const;
+	const std::map<unsigned, int> &get_turnouts() const { return turnouts; }
+	void add_track(const Track &);
+	void add_tracks(const std::set<const Track *> &);
+	const std::set<const Track *> &get_tracks() const { return tracks; }
+	void save(std::list<Msp::DataFile::Statement> &) const;
+private:
+	void update_turnouts();
+	unsigned check_validity(const Track &) const;
+	void track_removed(Track &);
 };
-typedef std::list<Route *> RouteSeq;
 
 } // namespace Marklin