X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=2e3248f28878bf0a7000d874895c69d2675f3056;hb=651698847d5293cfb15b6fb23a394701388c0151;hp=044b310bda43cb77948a8d17cd8149f219b1983e;hpb=dcfa1e9503b7e97b61396d7458f0b2e5896779cd;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index 044b310..2e3248f 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,16 +1,14 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <msp/net/inet.h>
-#include "libmarklin/control.h"
-#include "libmarklin/layout.h"
-#include "libmarklin/locomotive.h"
 #include "libmarklin/locotype.h"
 #include "libmarklin/route.h"
+#include "libmarklin/train.h"
 #include "server.h"
 
 using namespace std;
@@ -18,14 +16,16 @@ using namespace Msp;
 
 namespace Marklin {
 
-Server::Server(TrafficManager &tm):
-	trfc_mgr(tm),
+Server::Server(Layout &l):
+	layout(l),
 	listen_sock(Net::INET),
 	event_disp(0)
 {
-	const list<Train *> &trains = trfc_mgr.get_trains();
-	for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-		train_added(**i);
+	layout.signal_train_added.connect(sigc::mem_fun(this, &Server::train_added));
+
+	const map<unsigned, Train *> &trains = layout.get_trains();
+	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+		train_added(*i->second);
 
 	listen_sock.listen(Net::InetAddr(0, 8315), 4);
 	listen_sock.signal_data_available.connect(sigc::mem_fun(this, &Server::incoming_connection));
@@ -47,16 +47,15 @@ void Server::incoming_connection()
 
 void Server::train_added(Train &train)
 {
-	Locomotive &loco = train.get_locomotive();
 	train.signal_target_speed_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_speed_changed), sigc::ref(train)));
-	loco.signal_reverse_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_reverse_changed), sigc::ref(train)));
-	loco.signal_function_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_function_changed), sigc::ref(train)));
+	train.signal_reverse_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_reverse_changed), sigc::ref(train)));
+	train.signal_function_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_function_changed), sigc::ref(train)));
 	train.signal_route_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_route_changed), sigc::ref(train)));
 	train.signal_status_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_status_changed), sigc::ref(train)));
 
 	TrainInfoPacket pkt;
-	pkt.address = loco.get_address();
-	pkt.loco_type = loco.get_type().get_article_number();
+	pkt.address = train.get_address();
+	pkt.loco_type = train.get_locomotive_type().get_article_number();
 	pkt.name = train.get_name();
 	send(pkt);
 }
@@ -64,16 +63,16 @@ void Server::train_added(Train &train)
 void Server::train_speed_changed(const Train &train, unsigned speed)
 {
 	TrainSpeedPacket pkt;
-	pkt.address = train.get_locomotive().get_address();
+	pkt.address = train.get_address();
 	pkt.speed = speed;
-	pkt.reverse = train.get_locomotive().get_reverse();
+	pkt.reverse = train.get_reverse();
 	send(pkt);
 }
 
 void Server::train_reverse_changed(const Train &train, bool reverse)
 {
 	TrainSpeedPacket pkt;
-	pkt.address = train.get_locomotive().get_address();
+	pkt.address = train.get_address();
 	pkt.speed = train.get_target_speed();
 	pkt.reverse = reverse;
 	send(pkt);
@@ -82,15 +81,15 @@ void Server::train_reverse_changed(const Train &train, bool reverse)
 void Server::train_function_changed(const Train &train, unsigned, bool)
 {
 	TrainFunctionPacket pkt;
-	pkt.address = train.get_locomotive().get_address();
-	pkt.functions = train.get_locomotive().get_functions();
+	pkt.address = train.get_address();
+	pkt.functions = train.get_functions();
 	send(pkt);
 }
 
 void Server::train_route_changed(const Train &train, const Route *route)
 {
 	TrainRoutePacket pkt;
-	pkt.address = train.get_locomotive().get_address();
+	pkt.address = train.get_address();
 	if(route)
 		pkt.route = route->get_name();
 	send(pkt);
@@ -99,7 +98,7 @@ void Server::train_route_changed(const Train &train, const Route *route)
 void Server::train_status_changed(const Train &train, const string &status)
 {
 	TrainStatusPacket pkt;
-	pkt.address = train.get_locomotive().get_address();
+	pkt.address = train.get_address();
 	pkt.status = status;
 	send(pkt);
 }
@@ -130,7 +129,7 @@ Server::Connection::~Connection()
 
 void Server::Connection::handshake_done()
 {
-	const map<string, Route *> &routes = server.trfc_mgr.get_layout().get_routes();
+	const map<string, Route *> &routes = server.layout.get_routes();
 	for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 	{
 		RouteInfoPacket pkt;
@@ -138,42 +137,42 @@ void Server::Connection::handshake_done()
 		comm.send(pkt);
 	}
 
-	const list<Train *> &trains = server.trfc_mgr.get_trains();
-	for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+	const map<unsigned, Train *> &trains = server.layout.get_trains();
+	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
-		Locomotive &loco = (*i)->get_locomotive();
+		const Train &train = *i->second;
 
 		{
 			TrainInfoPacket pkt;
-			pkt.address = loco.get_address();
-			pkt.loco_type = loco.get_type().get_article_number();
-			pkt.name = (*i)->get_name();
+			pkt.address = train.get_address();
+			pkt.loco_type = train.get_locomotive_type().get_article_number();
+			pkt.name = train.get_name();
 			comm.send(pkt);
 		}
 		{
 			TrainSpeedPacket pkt;
-			pkt.address = loco.get_address();
-			pkt.speed = (*i)->get_target_speed();
-			pkt.reverse = loco.get_reverse();
+			pkt.address = train.get_address();
+			pkt.speed = train.get_target_speed();
+			pkt.reverse = train.get_reverse();
 			comm.send(pkt);
 		}
 		{
 			TrainFunctionPacket pkt;
-			pkt.address = loco.get_address();
-			pkt.functions = loco.get_functions();
+			pkt.address = train.get_address();
+			pkt.functions = train.get_functions();
 			comm.send(pkt);
 		}
 		{
 			TrainStatusPacket pkt;
-			pkt.address = loco.get_address();
-			pkt.status = (*i)->get_status();
+			pkt.address = train.get_address();
+			pkt.status = train.get_status();
 			comm.send(pkt);
 		}
-		if((*i)->get_route())
+		if(train.get_route())
 		{
 			TrainRoutePacket pkt;
-			pkt.address = loco.get_address();
-			pkt.route = (*i)->get_route()->get_name();
+			pkt.address = train.get_address();
+			pkt.route = train.get_route()->get_name();
 			comm.send(pkt);
 		}
 	}
@@ -189,9 +188,8 @@ void Server::Connection::receive(const TrainSpeedPacket &pkt)
 {
 	try
 	{
-		Locomotive &loco = server.trfc_mgr.get_control().get_locomotive(pkt.address);
-		Train &train = server.trfc_mgr.get_train_by_locomotive(loco);
-		if(pkt.reverse!=loco.get_reverse())
+		Train &train = server.layout.get_train(pkt.address);
+		if(pkt.reverse!=train.get_reverse())
 			train.set_reverse(pkt.reverse);
 		else
 			train.set_speed(pkt.speed);
@@ -206,10 +204,10 @@ void Server::Connection::receive(const TrainFunctionPacket &pkt)
 {
 	try
 	{
-		Locomotive &loco = server.trfc_mgr.get_control().get_locomotive(pkt.address);
+		Train &train = server.layout.get_train(pkt.address);
 		for(unsigned i=0; i<9; ++i)
-			if(((pkt.functions^loco.get_functions())>>i)&1)
-				loco.set_function(i, (pkt.functions>>i)&1);
+			if(((pkt.functions^train.get_functions())>>i)&1)
+				train.set_function(i, (pkt.functions>>i)&1);
 	}
 	catch(const Exception &e)
 	{
@@ -221,13 +219,12 @@ void Server::Connection::receive(const TrainRoutePacket &pkt)
 {
 	try
 	{
-		Locomotive &loco = server.trfc_mgr.get_control().get_locomotive(pkt.address);
-		Train &train = server.trfc_mgr.get_train_by_locomotive(loco);
+		Train &train = server.layout.get_train(pkt.address);
 		if(pkt.route.empty())
 			train.set_route(0);
 		else
 		{
-			Route &route = server.trfc_mgr.get_layout().get_route(pkt.route);
+			Route &route = server.layout.get_route(pkt.route);
 			train.set_route(&route);
 		}
 	}