X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.h;h=6e69bba955aa3c24b8705e7370b5d230d04bd186;hb=444c7efb2fadb10e98197a62b791829d821370c0;hp=f1f3664daac74325a98fdbab6db982d7f4f29338;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/route.h b/source/libmarklin/route.h
index f1f3664..6e69bba 100644
--- a/source/libmarklin/route.h
+++ b/source/libmarklin/route.h
@@ -1,17 +1,17 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+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 <msp/datafile/loader.h>
 
 namespace Marklin {
 
@@ -21,14 +21,32 @@ class Turnout;
 class Route
 {
 public:
-	Route();
-	const std::map<unsigned, Turnout *> &get_turnouts() const { return turnouts; }
-	void add_track(Track *);
-	~Route();
+	class Loader: public Msp::DataFile::BasicLoader<Route>
+	{
+	public:
+		Loader(Route &);
+	private:
+		void turnout(unsigned, unsigned);
+	};
+
 private:
 	std::string name;
-	std::set<Track *> tracks;
-	std::map<unsigned, Turnout *> turnouts;
+	std::set<const Track *> tracks;
+	std::map<unsigned, int> turnouts;
+
+public:
+	Route(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;
 };
 
 } // namespace Marklin