Emit various signals from Train when it's loaded

[r2c2.git] / source / libmarklin / train.cpp

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index c127086d43d3d1ec2d647dac0ae067418e83616f..56832c837542d9447acb3022a8d655e1a8786939 100644 (file)
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -580,7 +580,7 @@ Train::Loader::Loader(Train &t):
 {
        add("block",       &Loader::block);
        add("block_hint",  &Loader::block_hint);
-       add("name",        &Train::name);
+       add("name",        &Loader::name);
        add("real_speed",  &Loader::real_speed);
        add("route",       &Loader::route);
 }
@@ -596,7 +596,7 @@ void Train::Loader::block(unsigned id)
 
        blk.reserve(&obj);
        obj.cur_blocks.push_back(BlockRef(&blk, entry));
-       obj.status = "Stopped";
+       obj.set_status("Stopped");
        obj.set_position(blk.get_endpoints()[entry]);
 
        prev_block = &blk;
@@ -607,6 +607,11 @@ void Train::Loader::block_hint(unsigned id)
        prev_block = &obj.trfc_mgr.get_block(id);
 }
 
+void Train::Loader::name(const string &n)
+{
+       obj.set_name(n);
+}
+
 void Train::Loader::real_speed(unsigned i, float speed, float weight)
 {
        obj.real_speed[i].speed = speed;
@@ -615,7 +620,7 @@ void Train::Loader::real_speed(unsigned i, float speed, float weight)
 
 void Train::Loader::route(const string &n)
 {
-       obj.route = &obj.trfc_mgr.get_layout().get_route(n);
+       obj.set_route(&obj.trfc_mgr.get_layout().get_route(n));
 }
 
 } // namespace Marklin