Rename the project to R²C²

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

diff --git a/source/network/server.h b/source/network/server.h
index 41bb8e9b50bc9765767efa7ae5a1c09868e66d13..ced08aac06eb2df544a9dd8e741cf6cdcfc75e2f 100644 (file)
--- a/source/network/server.h
+++ b/source/network/server.h
@@ -1,27 +1,27 @@
 /* $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
 */
 
-#ifndef MARKLINNET_SERVER_H_
-#define MARKLINNET_SERVER_H_
+#ifndef R2C2_NET_SERVER_H_
+#define R2C2_NET_SERVER_H_
 
 #include <msp/io/eventdispatcher.h>
 #include <msp/net/communicator.h>
 #include <msp/net/streamsocket.h>
 #include <msp/net/streamlistensocket.h>
-#include "libmarklin/layout.h"
+#include "libr2c2/layout.h"
 #include "packets.h"
 #include "protocol.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Server
 {
 private:
-       struct Connection: private Msp::Net::PacketReceiver<TrainSpeedPacket>,
+       struct Connection: private Msp::Net::PacketReceiver<TrainControlPacket>,
                private Msp::Net::PacketReceiver<TrainFunctionPacket>,
                private Msp::Net::PacketReceiver<TrainRoutePacket>
        {
@@ -35,7 +35,7 @@ private:
 
                void handshake_done();
                void end_of_file();
-               virtual void receive(const TrainSpeedPacket &);
+               virtual void receive(const TrainControlPacket &);
                virtual void receive(const TrainFunctionPacket &);
                virtual void receive(const TrainRoutePacket &);
                void error(const std::string &);
@@ -54,8 +54,7 @@ private:
        void incoming_connection();
 
        void train_added(Train &);
-       void train_speed_changed(const Train &, unsigned);
-       void train_reverse_changed(const Train &, bool);
+       void train_control_changed(const Train &, const std::string &, float);
        void train_function_changed(const Train &, unsigned, bool);
        void train_route_changed(const Train &, const Route *);
        void train_status_changed(const Train &, const std::string &);
@@ -64,6 +63,6 @@ private:
        void send(const P &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif