X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=0b88d8ac6af6fef6f5fee5af9da7cd51be8d52b7;hb=25b79ab38c2be2e5c89b8240504f641fd9c4899c;hp=117211244cea2984eacfe1600ec488a268075cee;hpb=aead7f2da831199fbb8f6950b067656b2965c2fa;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 1172112..0b88d8a 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -30,23 +30,30 @@ private:
 	std::list<BlockRef> rsv_blocks;
 	unsigned target_speed;
 	Msp::Time::TimeStamp try_reserve;
+	std::string status;
+	Msp::Time::TimeStamp last_entry_time;
+	float travel_dist;
+	unsigned real_speed;
 
 public:
 	sigc::signal<void, const std::string &> signal_name_changed;
+	sigc::signal<void, const std::string &> signal_status_changed;
 
 	Train(TrafficManager &, Locomotive &);
+
 	void set_name(const std::string &);
 	void set_speed(unsigned);
 	const std::string &get_name() const { return name; }
 	Locomotive &get_locomotive() const { return loco; }
+	const std::string &get_status() const { return status; }
 	void place(Block *, unsigned);
 	bool free_block(Block *);
 	void tick(const Msp::Time::TimeStamp &);
 private:
 	void sensor_event(bool, Sensor *);
 	bool reserve_more();
+	void set_status(const std::string &);
 };
-typedef std::list<Train *> TrainSeq;
 
 } // namespace Marklin