Rename the project to R²C²

[r2c2.git] / source / network / server.cpp

diff --git a/source/network/server.cpp b/source/network/server.cpp
index 2e3248f28878bf0a7000d874895c69d2675f3056..404faa94a6fa83826f46403fd7ff08110d1d231d 100644 (file)
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,20 +1,20 @@
 /* $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/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),
@@ -47,34 +47,24 @@ void Server::incoming_connection()
 
 void Server::train_added(Train &train)
 {
-       train.signal_target_speed_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_speed_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_control_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_control_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 = 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);
 }
 
-void Server::train_speed_changed(const Train &train, unsigned speed)
+void Server::train_control_changed(const Train &train, const string &control, float value)
 {
-       TrainSpeedPacket pkt;
+       TrainControlPacket pkt;
        pkt.address = train.get_address();
-       pkt.speed = speed;
-       pkt.reverse = train.get_reverse();
-       send(pkt);
-}
-
-void Server::train_reverse_changed(const Train &train, bool reverse)
-{
-       TrainSpeedPacket pkt;
-       pkt.address = train.get_address();
-       pkt.speed = train.get_target_speed();
-       pkt.reverse = reverse;
+       pkt.control = control;
+       pkt.value = value;
        send(pkt);
 }
 
@@ -129,11 +119,11 @@ 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)
+       const set<Route *> &routes = server.layout.get_routes();
+       for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
        {
                RouteInfoPacket pkt;
-               pkt.name = i->first;
+               pkt.name = (*i)->get_name();
                comm.send(pkt);
        }
 
@@ -145,17 +135,11 @@ 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);
                }
-               {
-                       TrainSpeedPacket pkt;
-                       pkt.address = train.get_address();
-                       pkt.speed = train.get_target_speed();
-                       pkt.reverse = train.get_reverse();
-                       comm.send(pkt);
-               }
+               // XXX Need control enumeration to send control packets
                {
                        TrainFunctionPacket pkt;
                        pkt.address = train.get_address();
@@ -184,15 +168,12 @@ void Server::Connection::end_of_file()
        stale = true;
 }
 
-void Server::Connection::receive(const TrainSpeedPacket &pkt)
+void Server::Connection::receive(const TrainControlPacket &pkt)
 {
        try
        {
                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);
+               train.set_control(pkt.control, pkt.value);
        }
        catch(const Exception &e)
        {
@@ -241,4 +222,4 @@ void Server::Connection::error(const string &msg)
        comm.send(pkt);
 }
 
-} // namespace Marklin
+} // namespace R2C2