X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=4c19caf01a9625a9921b4a345bd4baada65a177e;hb=f9254f57b736927a57a2fd793ee18f6c9766dd43;hp=b84844aa050a999ddeeb5b93cb8ce97c5666ab46;hpb=3df8cb5c78fbb0b919bcb79677c6c788b8028482;p=r2c2.git diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h index b84844a..4c19caf 100644 --- a/source/libmarklin/train.h +++ b/source/libmarklin/train.h @@ -28,6 +28,9 @@ public: Loader(Train &); }; + sigc::signal signal_name_changed; + sigc::signal signal_status_changed; + private: struct BlockRef { @@ -59,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; } @@ -75,7 +76,10 @@ public: 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 &);