X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fclient.cpp;h=41cd28e900a712a5f5cc5693777bec615381e4f7;hb=abed4a255060d5a233ec0ac2dd60af9132e29201;hp=8e31cfe54c59b9cfe5e501722b31c112e36ea3c7;hpb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;p=r2c2.git

diff --git a/source/network/client.cpp b/source/network/client.cpp
index 8e31cfe..41cd28e 100644
--- a/source/network/client.cpp
+++ b/source/network/client.cpp
@@ -1,22 +1,18 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <msp/core/maputils.h>
 #include "client.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Client::Client(const Catalogue &c):
 	catalogue(c),
 	socket(0),
 	comm(0),
-	event_disp(0)
+	event_disp(0),
+	power(false),
+	halt(false)
 { }
 
 Client::~Client()
@@ -43,12 +39,44 @@ void Client::connect(const Net::SockAddr &addr)
 	comm = new Net::Communicator(*socket, proto, *this);
 }
 
-NetTrain &Client::get_train(unsigned addr)
+void Client::set_power(bool p)
+{
+	DriverStatePacket pkt;
+	pkt.power = p;
+	pkt.halt = halt;
+	send(pkt);
+}
+
+void Client::set_halt(bool h)
 {
-	map<unsigned, NetTrain *>::iterator i = trains.find(addr);
-	if(i==trains.end())
-		throw KeyError("Unknown train");
-	return *i->second;
+	DriverStatePacket pkt;
+	pkt.power = power;
+	pkt.halt = h;
+	send(pkt);
+}
+
+NetTrain &Client::get_train(unsigned addr) const
+{
+	return *get_item(trains, addr);
+}
+
+void Client::receive(const DriverStatePacket &pkt)
+{
+	if(pkt.power!=power)
+	{
+		power = pkt.power;
+		signal_power_changed.emit(power);
+	}
+	if(pkt.halt!=halt)
+	{
+		halt = pkt.halt;
+		signal_halt_changed.emit(halt);
+	}
+}
+
+void Client::receive(const EmergencyPacket &pkt)
+{
+	signal_emergency.emit(pkt.message);
 }
 
 void Client::receive(const TrainInfoPacket &pkt)
@@ -58,7 +86,7 @@ void Client::receive(const TrainInfoPacket &pkt)
 	signal_train_added.emit(*train);
 }
 
-void Client::receive(const TrainSpeedPacket &pkt)
+void Client::receive(const TrainControlPacket &pkt)
 {
 	get_train(pkt.address).process_packet(pkt);
 }
@@ -83,4 +111,9 @@ void Client::receive(const TrainRoutePacket &pkt)
 	get_train(pkt.address).process_packet(pkt);
 }
 
-} // namespace Marklin
+void Client::receive(const ErrorPacket &pkt)
+{
+	signal_error.emit(pkt.message);
+}
+
+} // namespace R2C2