X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=43d22ffef9016f26b376e691d840840bea13a940;hb=fadc35133b1ebbd98af948c1fa529dcde6fddcfd;hp=dd0dd8b927bde2a43ea9522d30aaef3f99cd912a;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index dd0dd8b..43d22ff 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,26 +1,31 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <msp/net/inet.h>
-#include "libmarklin/locotype.h"
-#include "libmarklin/route.h"
-#include "libmarklin/train.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/route.h"
+#include "libr2c2/train.h"
+#include "libr2c2/vehicletype.h"
 #include "server.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Server::Server(Layout &l):
 	layout(l),
 	listen_sock(Net::INET),
 	event_disp(0)
 {
+	layout.get_driver().signal_power.connect(sigc::hide(sigc::mem_fun(this, &Server::driver_state_changed)));
+	layout.get_driver().signal_halt.connect(sigc::hide(sigc::mem_fun(this, &Server::driver_state_changed)));
+	layout.signal_emergency.connect(sigc::mem_fun(this, &Server::emergency));
+
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Server::train_added));
 
 	const map<unsigned, Train *> &trains = layout.get_trains();
@@ -45,6 +50,21 @@ void Server::incoming_connection()
 	connections.push_back(new Connection(*this, sock));
 }
 
+void Server::driver_state_changed()
+{
+	DriverStatePacket pkt;
+	pkt.power = layout.get_driver().get_power();
+	pkt.halt = layout.get_driver().is_halted();
+	send(pkt);
+}
+
+void Server::emergency(const string &msg)
+{
+	EmergencyPacket pkt;
+	pkt.message = msg;
+	send(pkt);
+}
+
 void Server::train_added(Train &train)
 {
 	train.signal_control_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_control_changed), sigc::ref(train)));
@@ -54,7 +74,7 @@ void Server::train_added(Train &train)
 
 	TrainInfoPacket pkt;
 	pkt.address = train.get_address();
-	pkt.loco_type = train.get_locomotive_type().get_article_number();
+	pkt.loco_type = train.get_locomotive_type().get_article_number().str();
 	pkt.name = train.get_name();
 	send(pkt);
 }
@@ -119,14 +139,22 @@ Server::Connection::~Connection()
 
 void Server::Connection::handshake_done()
 {
-	const map<string, Route *> &routes = server.layout.get_routes();
-	for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 	{
-		RouteInfoPacket pkt;
-		pkt.name = i->first;
+		DriverStatePacket pkt;
+		pkt.power = server.layout.get_driver().get_power();
+		pkt.halt = server.layout.get_driver().is_halted();
 		comm.send(pkt);
 	}
 
+	const set<Route *> &routes = server.layout.get_routes();
+	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+		if(!(*i)->is_temporary())
+		{
+			RouteInfoPacket pkt;
+			pkt.name = (*i)->get_name();
+			comm.send(pkt);
+		}
+
 	const map<unsigned, Train *> &trains = server.layout.get_trains();
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
@@ -135,11 +163,22 @@ void Server::Connection::handshake_done()
 		{
 			TrainInfoPacket pkt;
 			pkt.address = train.get_address();
-			pkt.loco_type = train.get_locomotive_type().get_article_number();
+			pkt.loco_type = train.get_locomotive_type().get_article_number().str();
 			pkt.name = train.get_name();
 			comm.send(pkt);
 		}
-		// XXX Need control enumeration to send control packets
+		for(unsigned j=0;; ++j)
+		{
+			const char *name = train.get_controller().enumerate_controls(j);
+			if(!name)
+				break;
+
+			TrainControlPacket pkt;
+			pkt.address = train.get_address();
+			pkt.control = name;
+			pkt.value = train.get_control(name);
+			comm.send(pkt);
+		}
 		{
 			TrainFunctionPacket pkt;
 			pkt.address = train.get_address();
@@ -168,6 +207,15 @@ void Server::Connection::end_of_file()
 	stale = true;
 }
 
+void Server::Connection::receive(const DriverStatePacket &pkt)
+{
+	Driver &driver = server.layout.get_driver();
+	if(pkt.power!=driver.get_power())
+		driver.set_power(pkt.power);
+	if(pkt.halt!=driver.is_halted())
+		driver.halt(pkt.halt);
+}
+
 void Server::Connection::receive(const TrainControlPacket &pkt)
 {
 	try
@@ -222,4 +270,4 @@ void Server::Connection::error(const string &msg)
 	comm.send(pkt);
 }
 
-} // namespace Marklin
+} // namespace R2C2