X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=4c19caf01a9625a9921b4a345bd4baada65a177e;hb=f9254f57b736927a57a2fd793ee18f6c9766dd43;hp=6a7d2dea949dfe728a698155bcfd4adc7bace723;hpb=319f90fd59587efc1242c34f307abc29f323642b;p=r2c2.git diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h index 6a7d2de..4c19caf 100644 --- a/source/libmarklin/train.h +++ b/source/libmarklin/train.h @@ -21,6 +21,16 @@ class TrafficManager; class Train: public sigc::trackable { +public: + class Loader: public Msp::DataFile::BasicLoader + { + public: + Loader(Train &); + }; + + sigc::signal signal_name_changed; + sigc::signal signal_status_changed; + private: struct BlockRef { @@ -52,13 +62,11 @@ private: Point pos; public: - sigc::signal signal_name_changed; - sigc::signal signal_status_changed; - 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; } const std::string &get_status() const { return status; } @@ -66,8 +74,12 @@ public: void place(Block *, unsigned); bool free_block(Block *); void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &); + void save(std::list &) 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 &);