Generate IDs for new turnouts

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

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index 385a3cfab760e17d7beab074501e6d4cd3bf30ce..f820cb5dc73e6c6fc05166ab6816de11b7922c06 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -50,6 +50,7 @@ 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;
@@ -61,6 +62,7 @@ private:
        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 +76,7 @@ public:
        void add_track(Track &);
        const std::set<Track *> &get_tracks() const { return tracks; }
        void remove_track(Track &);
+       unsigned allocate_turnout_id();
 
        void add_block(Block &);
        Block &get_block(unsigned) const;
@@ -86,6 +89,7 @@ public:
        void add_route(Route &);
        const std::map<std::string, 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 +101,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