#include <msp/core/refptr.h>
#include <msp/net/inet.h>
#include <msp/net/resolve.h>
+#include "libr2c2/catalogue.h"
#include "libr2c2/driver.h"
#include "libr2c2/route.h"
#include "libr2c2/train.h"
listen_sock.signal_data_available.connect(sigc::mem_fun(this, &Server::incoming_connection));
}
+Server::~Server()
+{ }
+
void Server::use_event_dispatcher(IO::EventDispatcher &ed)
{
event_disp = &ed;
send(pkt);
}
-void Server::emergency(const string &msg)
+void Server::emergency(Block *, const string &msg)
{
EmergencyPacket pkt;
pkt.message = msg;
TrainInfoPacket pkt;
pkt.address = train.get_address();
- pkt.loco_type = train.get_locomotive_type().get_article_number().str();
+ pkt.loco_type = layout.get_catalogue().get_name(&train.get_locomotive_type());
pkt.name = train.get_name();
send(pkt);
- TrainStatus *status = new TrainStatus(train);
- status->set_tag("server:status");
- status->signal_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_status_changed), sigc::ref(train)));
+ if(!train.get_ai_of_type<TrainStatus>())
+ new TrainStatus(train);
}
void Server::train_control_changed(const Train &train, const string &control, float value)
pkt.route = route->get_name();
send(pkt);
}
-}
-
-void Server::train_status_changed(const Train &train, const string &status)
-{
- TrainStatusPacket pkt;
- pkt.address = train.get_address();
- pkt.status = status;
- send(pkt);
+ else if(ev.type=="status-changed")
+ {
+ TrainStatusPacket pkt;
+ pkt.address = train.get_address();
+ pkt.status = ev.value.value<std::string>();
+ send(pkt);
+ }
}
template<typename P>
comm.send(pkt);
}
- const set<Route *> &routes = server.layout.get_routes();
+ const set<Route *> &routes = server.layout.get_all<Route>();
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
if(!(*i)->is_temporary())
{
comm.send(pkt);
}
+ const Catalogue &cat = server.layout.get_catalogue();
const map<unsigned, Train *> &trains = server.layout.get_trains();
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
{
TrainInfoPacket pkt;
pkt.address = train.get_address();
- pkt.loco_type = train.get_locomotive_type().get_article_number().str();
+ pkt.loco_type = cat.get_name(&train.get_locomotive_type());
pkt.name = train.get_name();
comm.send(pkt);
}
pkt.functions = train.get_functions();
comm.send(pkt);
}
- if(TrainStatus *status = dynamic_cast<TrainStatus *>(train.get_tagged_ai("server:status")))
+ if(TrainStatus *status = train.get_ai_of_type<TrainStatus>())
{
TrainStatusPacket pkt;
pkt.address = train.get_address();
pkt.status = status->get_status();
comm.send(pkt);
}
- if(TrainRouter *router = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router")))
+ if(TrainRouter *router = train.get_ai_of_type<TrainRouter>())
{
TrainRoutePacket pkt;
pkt.address = train.get_address();