X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftimetable.h;h=b4f9cc1b2fd2972ed097926e54c31a45824101f5;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=72e12d3d9980f5ca1a66732678c88abfd17cf20e;hpb=42398f0178d499bb013ccc08f0c29f69f6f1ad2d;p=r2c2.git

diff --git a/source/libmarklin/timetable.h b/source/libmarklin/timetable.h
index 72e12d3..b4f9cc1 100644
--- a/source/libmarklin/timetable.h
+++ b/source/libmarklin/timetable.h
@@ -34,13 +34,15 @@ public:
 		void speed(unsigned);
 		void travel(const std::string &);
 		void wait(unsigned);
+		void wait_train(unsigned, const std::string &);
 	};
 
 	enum RowType
 	{
 		GOTO,
 		TRAVEL,
-		WAIT,
+		WAIT_TIME,
+		WAIT_TRAIN,
 		ARRIVE,
 		SPEED,
 		REVERSE,
@@ -74,6 +76,7 @@ private:
 	unsigned current_row;
 	bool executing;
 	Block *pending_block;
+	Train *pending_train;
 	Msp::Time::TimeStamp wait_timeout;
 
 public: