Add networking library and a remote control program

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 43ee84dc5cd6c590e7d7a69a16dfe0eb0f3cf982..9b6344c2fa104066bbb782f0dc6e87bfa3fcd832 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -21,6 +21,17 @@ class TrafficManager;
 
 class Train: public sigc::trackable
 {
+public:
+       class Loader: public Msp::DataFile::BasicLoader<Train>
+       {
+       public:
+               Loader(Train &);
+       };
+
+       sigc::signal<void, const std::string &> signal_name_changed;
+       sigc::signal<void, unsigned> signal_target_speed_changed;
+       sigc::signal<void, const std::string &> signal_status_changed;
+
 private:
        struct BlockRef
        {
@@ -38,28 +49,43 @@ private:
        unsigned target_speed;
        Msp::Time::TimeStamp try_reserve;
        std::string status;
+
        Msp::Time::TimeStamp last_entry_time;
        float travel_dist;
-       unsigned real_speed;
+       unsigned travel_speed;
+       bool pure_speed;
+       float speed_scale;
+       float speed_scale_weight;
 
-public:
-       sigc::signal<void, const std::string &> signal_name_changed;
-       sigc::signal<void, const std::string &> signal_status_changed;
+       Track *cur_track;
+       unsigned cur_track_ep;
+       float offset;
+       Point pos;
 
+public:
        Train(TrafficManager &, Locomotive &);
 
        void set_name(const std::string &);
        void set_speed(unsigned);
+       void set_reverse(bool);
        const std::string &get_name() const { return name; }
        Locomotive &get_locomotive() const { return loco; }
+       unsigned get_target_speed() const { return target_speed; }
        const std::string &get_status() const { return status; }
+       const Point &get_position() const { return pos; }
        void place(Block *, unsigned);
        bool free_block(Block *);
-       void tick(const Msp::Time::TimeStamp &);
+       void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+       void save(std::list<Msp::DataFile::Statement> &) const;
 private:
+       void locomotive_reverse_changed(bool);
        void sensor_event(bool, Sensor *);
+       void turnout_route_changing(unsigned, Turnout *);
+       void turnout_route_changed(unsigned, Turnout *);
        unsigned reserve_more();
+       void update_speed();
        void set_status(const std::string &);
+       void set_position(const Block::Endpoint &);
 };
 
 } // namespace Marklin