path_changing(false)
{
if(type.is_turnout())
+ {
turnout_id = layout.allocate_turnout_id();
+ if(layout.has_driver())
+ {
+ Driver &driver = layout.get_driver();
+ driver.add_turnout(turnout_id, type);
+ driver.signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
+ }
+ }
+
layout.add(*this);
- if(layout.has_driver())
- layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
for(unsigned paths = type.get_paths(); !(paths&1); ++active_path, paths>>=1) ;
}
Track::~Track()
{
break_links();
+ if(layout.has_driver() && turnout_id)
+ layout.get_driver().remove_turnout(turnout_id);
layout.remove(*this);
}
if(!i)
throw invalid_argument("Track::set_turnout_id");
+ Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
+
+ if(driver && turnout_id)
+ driver->remove_turnout(turnout_id);
turnout_id = i;
layout.create_blocks(*this);
layout.update_routes();
- if(layout.has_driver() && turnout_id)
- layout.get_driver().add_turnout(turnout_id, type);
+ if(driver && turnout_id)
+ driver->add_turnout(turnout_id, type);
}
void Track::set_sensor_id(unsigned i)
void Track::turnout_event(unsigned addr, unsigned state)
{
- if(!turnout_id)
- return;
-
if(addr==turnout_id)
{
active_path = state;