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 4e7bcd96ce83a8da61cd1396cfab41d90168cd3a..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;
@@ -38,7 +39,9 @@ public:
                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:
@@ -77,14 +80,13 @@ 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 &);