Set correct Z coordinate to vehicle position

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

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index 608ddece1eed1c2398fc36b101d2b0d6fb0c5063..6683e2d7ddb8de5c91ac781781c9c9fdb1bc01d9 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -21,6 +21,7 @@ class Driver;
 class Route;
 class Track;
 class Train;
+class Vehicle;
 
 class Layout
 {
@@ -46,7 +47,10 @@ public:
        sigc::signal<void, Route &> signal_route_removed;
        sigc::signal<void, Train &> signal_train_added;
        sigc::signal<void, Train &> signal_train_removed;
+       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;
@@ -56,6 +60,7 @@ private:
        std::map<std::string, Route *> routes;
        std::set<Block *> blocks;
        std::map<unsigned, Train *> trains;
+       std::set<Vehicle *> vehicles;
        Msp::Time::TimeStamp last_tick;
 
 public:
@@ -89,13 +94,18 @@ public:
        const std::map<unsigned, Train *> &get_trains() const { return trains; }
        void remove_train(Train &);
 
+       void add_vehicle(Vehicle &);
+       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