Forgot to add the new files

[r2c2.git] / source / libmarklin / trafficmanager.h

diff --git a/source/libmarklin/trafficmanager.h b/source/libmarklin/trafficmanager.h
index 2707e098fb6caad5f339cfa57f805c8caeec9d3e..266d2ff65ccf037eafcd7fdce468fddbd8bb9ad3 100644 (file)
--- a/source/libmarklin/trafficmanager.h
+++ b/source/libmarklin/trafficmanager.h
@@ -1,3 +1,10 @@
+/* $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_
 
@@ -13,23 +20,40 @@ 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:
        TrafficManager(Control &, Layout &);
        ~TrafficManager();
 
        Control &get_control() const { return control; }
+       Layout &get_layout() const { return layout; }
+       const std::list<Block *> &get_blocks() const { return blocks; }
+       Block &get_block(unsigned) const;
        Block &get_block_by_track(const Track &) const;
-       const TrainSeq &get_trains() const { return trains; }
+       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:
-       Control &control;
-       Layout &layout;
-       std::list<Block *> blocks;
-       std::list<Train *> trains;
-
-       void turnout_route_changed(unsigned, Turnout *);
+       void turnout_path_changed(unsigned, Turnout *);
 };
 
 } // namespace Marklin