sigc::signal<void, const TrackChain *> signal_waypoint_reached;
private:
- struct Wait
+ struct SequencePoint
{
Block *block;
- Train *train;
+ Train *preceding_train;
+ unsigned sequence_in;
+ unsigned sequence_out;
- Wait();
+ SequencePoint(Block &, unsigned);
};
typedef std::list<const Route *> RouteList;
const TrackChain *destination;
std::vector<const TrackChain *> waypoints;
std::vector<TrainRouteMetric *> metrics;
- std::list<Wait> waits;
+ std::list<SequencePoint> sequence_points;
+ std::list<SequencePoint *> pending_sequence_checks;
+ unsigned current_sequence;
Msp::Time::TimeDelta delay;
bool update_pending;
bool set_route(const Route *);
bool add_route(const Route &);
- void add_wait(Block &, Train *);
const Route *get_route() const;
+ void add_sequence_point(Block &, unsigned);
+ void add_sequence_point(Block &, Train &, unsigned, unsigned);
+ unsigned get_current_sequence() const { return current_sequence; }
void set_destination(const TrackChain &);
const TrackChain *get_destination() const { return destination; }