Create a more generic version of Train::get_reserved_distance

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index f9ea6f17ae0001b39432e8cd83b57ac8fb4cf9ce..f00d0fceec719d37b51242bddb6671394ab1c407 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -12,15 +12,14 @@ Distributed under the GPL
 #include <sigc++/trackable.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
+#include "controller.h"
 
 namespace Marklin {
 
-class ControlModel;
 class Route;
 class Timetable;
 class Vehicle;
 class VehicleType;
-struct TrainControl;
 
 class Train: public sigc::trackable
 {
@@ -75,11 +74,14 @@ private:
        unsigned address;
        std::string name;
        int priority;
+       const Train *yielding_to;
        std::vector<Vehicle *> vehicles;
        std::list<BlockRef> cur_blocks;
        std::list<BlockRef> rsv_blocks;
        Block *pending_block;
-       ControlModel *control;
+       bool reserving;
+       bool advancing;
+       Controller *controller;
        Timetable *timetable;
        bool active;
        unsigned current_speed;
@@ -109,8 +111,9 @@ public:
        void set_name(const std::string &);
        const std::string &get_name() const { return name; }
        void set_priority(int);
+       void yield_to(const Train &);
        int get_priority() const { return priority; }
-       ControlModel &get_control_model() const { return *control; }
+       Controller &get_controller() const { return *controller; }
 
        void add_vehicle(const VehicleType &);
        void remove_vehicle(unsigned);
@@ -145,7 +148,7 @@ public:
 
        void save(std::list<Msp::DataFile::Statement> &) const;
 private:
-       void control_changed(const TrainControl &);
+       void control_changed(const Controller::Control &);
        void loco_speed_event(unsigned, unsigned, bool);
        void loco_func_event(unsigned, unsigned, bool);
        void sensor_event(unsigned, bool);
@@ -153,6 +156,7 @@ private:
        void halt_event(bool);
        void block_reserved(const Block &, const Train *);
        unsigned reserve_more();
+       float get_reserved_distance_until(const Block *, bool) const;
        float get_real_speed(unsigned) const;
        unsigned find_speed(float) const;
        float get_travel_speed() const;