Rename the project to R²C²

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

diff --git a/source/network/client.h b/source/network/client.h
index ce8dcb66fc15cdb681157b57d3b5e50b968741fc..02295dfa32690aeb9a2d2610269fd4132ce83254 100644 (file)
--- a/source/network/client.h
+++ b/source/network/client.h
@@ -1,29 +1,33 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#ifndef MARKLINNET_CLIENT_H_
-#define MARKLINNET_CLIENT_H_
+#ifndef R2C2_NET_CLIENT_H_
+#define R2C2_NET_CLIENT_H_
 
 #include <msp/io/eventdispatcher.h>
 #include <msp/net/communicator.h>
-#include "libmarklin/catalogue.h"
+#include "libr2c2/catalogue.h"
 #include "packets.h"
 #include "protocol.h"
 #include "train.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Client: public Msp::Net::PacketReceiver<TrainInfoPacket>,
-       Msp::Net::PacketReceiver<TrainSpeedPacket>,
        Msp::Net::PacketReceiver<TrainFunctionPacket>,
-       Msp::Net::PacketReceiver<TrainStatusPacket>
+       Msp::Net::PacketReceiver<TrainControlPacket>,
+       Msp::Net::PacketReceiver<TrainStatusPacket>,
+       Msp::Net::PacketReceiver<RouteInfoPacket>,
+       Msp::Net::PacketReceiver<TrainRoutePacket>,
+       Msp::Net::PacketReceiver<ErrorPacket>
 {
 public:
        sigc::signal<void, NetTrain &> signal_train_added;
+       sigc::signal<void, const std::string &> signal_error;
 
 private:
        const Catalogue &catalogue;
@@ -31,6 +35,7 @@ private:
        Msp::Net::StreamSocket *socket;
        Msp::Net::Communicator *comm;
        Msp::IO::EventDispatcher *event_disp;
+       std::list<std::string> routes;
        std::map<unsigned, NetTrain *> trains;
 
 public:
@@ -45,15 +50,20 @@ public:
        { if(comm) comm->send(pkt); }
 
        const Catalogue &get_catalogue() const { return catalogue; }
-       NetTrain &get_train(unsigned);
+       const std::list<std::string> &get_routes() const { return routes; }
+       NetTrain &get_train(unsigned) const;
+       const std::map<unsigned, NetTrain *> &get_trains() const { return trains; }
 
 private:
        virtual void receive(const TrainInfoPacket &);
-       virtual void receive(const TrainSpeedPacket &);
+       virtual void receive(const TrainControlPacket &);
        virtual void receive(const TrainFunctionPacket &);
        virtual void receive(const TrainStatusPacket &);
+       virtual void receive(const RouteInfoPacket &);
+       virtual void receive(const TrainRoutePacket &);
+       virtual void receive(const ErrorPacket &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif