Make LCD output selectable at runtime through an extra I/O pin

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

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index f820cb5dc73e6c6fc05166ab6816de11b7922c06..2fc761aebb4aa972c020105e62a7bc626f6d346e 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -15,6 +15,7 @@ Distributed under the GPL
 
 namespace Marklin {
 
+class ArticleNumber;
 class Block;
 class Catalogue;
 class Driver;
@@ -35,9 +36,12 @@ public:
                Loader(Layout &);
        private:
                virtual void finish();
+               void route();
                void route(const std::string &);
                void track(unsigned);
-               void train(unsigned, unsigned);
+               void track(ArticleNumber);
+               void train(unsigned, unsigned, const std::string &);
+               void train(ArticleNumber, unsigned, const std::string &);
        };
 
 public:
@@ -57,7 +61,7 @@ private:
        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;
@@ -76,18 +80,17 @@ public:
        void add_track(Track &);
        const std::set<Track *> &get_tracks() const { return tracks; }
        void remove_track(Track &);
-       unsigned allocate_turnout_id();
+       unsigned allocate_turnout_id(bool);
 
        void add_block(Block &);
        Block &get_block(unsigned) const;
-       Block &get_block_by_track(const Track &) const;
        const std::set<Block *> &get_blocks() const { return blocks; }
        void create_blocks();
-       void create_blocks(const Track &);
+       void create_blocks(Track &);
        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 &);