Generate IDs for new turnouts

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

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index 6683e2d7ddb8de5c91ac781781c9c9fdb1bc01d9..f820cb5dc73e6c6fc05166ab6816de11b7922c06 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -62,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);
@@ -75,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;
@@ -87,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 &);
@@ -103,8 +106,6 @@ public:
        void save(const std::string &);
        void save_trains(const std::string &);
 private:
-       void check_links();
-       void check_routes();
        void sensor_event(unsigned, bool);
 };