Keep track of real speed separately for each speed step

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 9b6344c2fa104066bbb782f0dc6e87bfa3fcd832..65caa3f9fb245cf4c2ed47e8d71b214f03413e40 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -26,6 +26,8 @@ public:
        {
        public:
                Loader(Train &);
+       private:
+               void real_speed(unsigned, float, float);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
@@ -41,6 +43,15 @@ private:
                BlockRef(Block *s, unsigned e): block(s), entry(e) { }
        };
 
+       struct RealSpeed
+       {
+               float speed;
+               float weight;
+
+               RealSpeed();
+               void add(float, float);
+       };
+
        TrafficManager &trfc_mgr;
        std::string name;
        Locomotive &loco;
@@ -54,8 +65,7 @@ private:
        float travel_dist;
        unsigned travel_speed;
        bool pure_speed;
-       float speed_scale;
-       float speed_scale_weight;
+       std::vector<RealSpeed> real_speed;
 
        Track *cur_track;
        unsigned cur_track_ep;
@@ -84,8 +94,11 @@ private:
        void turnout_route_changed(unsigned, Turnout *);
        unsigned reserve_more();
        void update_speed();
+       float get_real_speed(unsigned) const;
+       unsigned find_speed(float) const;
        void set_status(const std::string &);
        void set_position(const Block::Endpoint &);
+       void release_reserved_blocks();
 };
 
 } // namespace Marklin