X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=02d1d52de1b8751d411bc5aa063300f46d2fb110;hb=29b131b59ba562f996a338a453745e5a4dfad5b7;hp=e8785f5e5994deb4ae275e670a0187676dd03534;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e8785f5..02d1d52 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -12,10 +12,10 @@ Distributed under the GPL
 #include <sigc++/trackable.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
+#include "controller.h"
 
 namespace Marklin {
 
-class ControlModel;
 class Route;
 class Timetable;
 class Vehicle;
@@ -33,6 +33,7 @@ public:
 	public:
 		Loader(Train &);
 	private:
+		virtual void finish();
 		void block(unsigned);
 		void block_hint(unsigned);
 		void name(const std::string &);
@@ -73,11 +74,14 @@ private:
 	unsigned address;
 	std::string name;
 	int priority;
+	const Train *yielding_to;
 	std::vector<Vehicle *> vehicles;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
 	Block *pending_block;
-	ControlModel *control;
+	bool reserving;
+	bool advancing;
+	Controller *controller;
 	Timetable *timetable;
 	bool active;
 	unsigned current_speed;
@@ -107,8 +111,9 @@ public:
 	void set_name(const std::string &);
 	const std::string &get_name() const { return name; }
 	void set_priority(int);
+	void yield_to(const Train &);
 	int get_priority() const { return priority; }
-	ControlModel &get_control() const { return *control; }
+	Controller &get_controller() const { return *controller; }
 
 	void add_vehicle(const VehicleType &);
 	void remove_vehicle(unsigned);
@@ -120,6 +125,7 @@ public:
 	void set_active(bool);
 	void set_function(unsigned, bool);
 	float get_control(const std::string &) const;
+	float get_speed() const;
 	bool is_active() const { return active; }
 	bool get_function(unsigned) const;
 	unsigned get_functions() const { return functions; }
@@ -131,6 +137,7 @@ public:
 	void go_to(const Track &);
 	const Route *get_route() const { return route; }
 	void place(Block &, unsigned);
+	void unplace();
 	bool is_placed() const { return !cur_blocks.empty(); }
 	bool free_block(Block &);
 	int get_entry_to_block(Block &) const;
@@ -142,6 +149,7 @@ public:
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
+	void control_changed(const Controller::Control &);
 	void loco_speed_event(unsigned, unsigned, bool);
 	void loco_func_event(unsigned, unsigned, bool);
 	void sensor_event(unsigned, bool);
@@ -149,6 +157,7 @@ private:
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
 	unsigned reserve_more();
+	float get_reserved_distance_until(const Block *, bool) const;
 	float get_real_speed(unsigned) const;
 	unsigned find_speed(float) const;
 	float get_travel_speed() const;