- Se levanta una planta por defecto desde un archivo (prueba.xml).

[z.facultad/75.42/plaqui.git] / Server / src / server.cpp

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 8704d696af2645528786b967c20a16a3d7912149..837295fbb071f54ba1753e0dd57283f32d5b8871 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -53,18 +53,19 @@ Server::~Server(void) {
        }
 }
 
        }
 }
 

-Server::Server(int port): TCPServer(port) {
+Server::Server(const string& plant_filename, const Connection::Port& port):
+               TCPServer(port) {

 #ifdef DEBUG
        cerr << __FILE__ <<  ": port = " << port << endl;
 #endif // DEBUG
        // FIXME
        Glib::Mutex::Lock lock(plants_mutex);
 #ifdef DEBUG
        cerr << __FILE__ <<  ": port = " << port << endl;
 #endif // DEBUG
        // FIXME
        Glib::Mutex::Lock lock(plants_mutex);

-       plants["prueba"] = new Plant("prueba.xml");
-       plants["prueba"]->signal_finished().connect(
+       plants["default"] = new Plant(plant_filename);
+       plants["default"]->signal_finished().connect(

                        SigC::bind<const char*>(
                                SigC::slot_class(*this, &Server::on_plant_finished),
                        SigC::bind<const char*>(
                                SigC::slot_class(*this, &Server::on_plant_finished),

-                               "prueba"));
-       plants["prueba"]->run();
+                               "default"));
+       plants["default"]->run();

 }
 
 Connection* Server::new_connection(
 }
 
 Connection* Server::new_connection(