X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fclient.h;h=a9ced6fc4f02e7cbb6cd17fcd283f754c32ed0ee;hb=754ac497179474d0266b55e881a084fef7d5d6a1;hp=02295dfa32690aeb9a2d2610269fd4132ce83254;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/network/client.h b/source/network/client.h
index 02295df..a9ced6f 100644
--- a/source/network/client.h
+++ b/source/network/client.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2009-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -17,7 +17,9 @@ Distributed under the GPL
 
 namespace R2C2 {
 
-class Client: public Msp::Net::PacketReceiver<TrainInfoPacket>,
+class Client: Msp::Net::PacketReceiver<DriverStatePacket>,
+	Msp::Net::PacketReceiver<EmergencyPacket>,
+	Msp::Net::PacketReceiver<TrainInfoPacket>,
 	Msp::Net::PacketReceiver<TrainFunctionPacket>,
 	Msp::Net::PacketReceiver<TrainControlPacket>,
 	Msp::Net::PacketReceiver<TrainStatusPacket>,
@@ -26,6 +28,9 @@ class Client: public Msp::Net::PacketReceiver<TrainInfoPacket>,
 	Msp::Net::PacketReceiver<ErrorPacket>
 {
 public:
+	sigc::signal<void, bool> signal_power_changed;
+	sigc::signal<void, bool> signal_halt_changed;
+	sigc::signal<void, const std::string &> signal_emergency;
 	sigc::signal<void, NetTrain &> signal_train_added;
 	sigc::signal<void, const std::string &> signal_error;
 
@@ -35,6 +40,8 @@ private:
 	Msp::Net::StreamSocket *socket;
 	Msp::Net::Communicator *comm;
 	Msp::IO::EventDispatcher *event_disp;
+	bool power;
+	bool halt;
 	std::list<std::string> routes;
 	std::map<unsigned, NetTrain *> trains;
 
@@ -51,10 +58,14 @@ public:
 
 	const Catalogue &get_catalogue() const { return catalogue; }
 	const std::list<std::string> &get_routes() const { return routes; }
+	void set_power(bool);
+	void set_halt(bool);
 	NetTrain &get_train(unsigned) const;
 	const std::map<unsigned, NetTrain *> &get_trains() const { return trains; }
 
 private:
+	virtual void receive(const DriverStatePacket &);
+	virtual void receive(const EmergencyPacket &);
 	virtual void receive(const TrainInfoPacket &);
 	virtual void receive(const TrainControlPacket &);
 	virtual void receive(const TrainFunctionPacket &);