Add a timetable row type to wait for another train

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

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index 385a3cfab760e17d7beab074501e6d4cd3bf30ce..0035e7a5481fdadc37ea29d51dd1903ed7863d84 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -35,6 +35,7 @@ public:
                Loader(Layout &);
        private:
                virtual void finish();
+               void route();
                void route(const std::string &);
                void track(unsigned);
                void train(unsigned, unsigned);
@@ -50,17 +51,19 @@ public:
        sigc::signal<void, Vehicle &> signal_vehicle_added;
        sigc::signal<void, Vehicle &> signal_vehicle_removed;
        sigc::signal<void, Block &, Train *> signal_block_reserved;
+       sigc::signal<void, const std::string &> signal_emergency;
 
 private:
        Catalogue &catalogue;
        Driver *driver;
        std::string base;
        std::set<Track *> tracks;
-       std::map<std::string, Route *> routes;
+       std::set<Route *> routes;
        std::set<Block *> blocks;
        std::map<unsigned, Train *> trains;
        std::set<Vehicle *> vehicles;
        Msp::Time::TimeStamp last_tick;
+       unsigned next_turnout_id;
 
 public:
        Layout(Catalogue &, Driver * = 0);
@@ -74,6 +77,7 @@ public:
        void add_track(Track &);
        const std::set<Track *> &get_tracks() const { return tracks; }
        void remove_track(Track &);
+       unsigned allocate_turnout_id(bool);
 
        void add_block(Block &);
        Block &get_block(unsigned) const;
@@ -84,8 +88,9 @@ public:
        void remove_block(Block &);
 
        void add_route(Route &);
-       const std::map<std::string, Route *> &get_routes() const { return routes; }
+       const std::set<Route *> &get_routes() const { return routes; }
        Route &get_route(const std::string &) const;
+       void update_routes();
        void remove_route(Route &);
 
        void add_train(Train &);
@@ -97,12 +102,12 @@ public:
        void remove_vehicle(Vehicle &);
 
        void tick();
+       void emergency(const std::string &);
 
        void save(const std::string &);
        void save_trains(const std::string &);
 private:
-       void check_links();
-       void check_routes();
+       void sensor_event(unsigned, bool);
 };
 
 } // namespace Marklin