Major code refactoring:

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

diff --git a/source/libmarklin/trafficmanager.h b/source/libmarklin/trafficmanager.h
index 11ecc9551b3a013aff96e86d9ffc7cc614ec9336..9db94448a72ac9068a4d5c7a64eedf551403174f 100644 (file)
--- a/source/libmarklin/trafficmanager.h
+++ b/source/libmarklin/trafficmanager.h
@@ -1,7 +1,7 @@
 #ifndef LIBMARKLIN_TRAFFICMANAGER_H_
 #define LIBMARKLIN_TRAFFICMANAGER_H_
 
-#include "section.h"
+#include "block.h"
 #include "train.h"
 
 namespace Marklin {
@@ -13,15 +13,20 @@ class Turnout;
 class TrafficManager
 {
 public:
+       sigc::signal<void, const Block &, const Train *> signal_block_reserved;
+
        TrafficManager(Control &, Layout &);
+       ~TrafficManager();
+
        Control &get_control() const { return control; }
-       Section *get_section_by_track(const Track *) const;
+       Block *get_block_by_track(const Track *) const;
+       const TrainSeq &get_trains() const { return trains; }
        void add_train(Train *);
 private:
        Control &control;
        Layout &layout;
-       SectionSeq sections;
-       TrainSeq trains;
+       std::list<Block *> blocks;
+       std::list<Train *> trains;
 
        void turnout_route_changed(unsigned, Turnout *);
 };