Major code refactoring:

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

diff --git a/source/libmarklin/turnout.cpp b/source/libmarklin/turnout.cpp
index eca9ae2f90ee6eca92a7f60c4346ca57a024af3a..a6e3f2d171739734e3a412cfb6ac9ec4436689a3 100644 (file)
--- a/source/libmarklin/turnout.cpp
+++ b/source/libmarklin/turnout.cpp
@@ -15,7 +15,7 @@ Turnout::Turnout(Control &c, unsigned a):
        addr(a),
        route(0)
 {
-       control.add_turnout(this);
+       control.add_turnout(*this);
 
        control.signal_turnout_event.connect(sigc::mem_fun(this, &Turnout::turnout_event));
 
@@ -31,7 +31,7 @@ void Turnout::set_route(unsigned r)
        route=r;
 
        command(true);
-       (new Time::Timer(200*Time::msec))->signal_timeout.connect(sigc::mem_fun(this, &Turnout::switch_timeout));
+       control.set_timer(200*Time::msec).signal_timeout.connect(sigc::mem_fun(this, &Turnout::switch_timeout));
 
        signal_route_changed.emit(route);
 }