Terminate the control thread if ArduControl device is not found

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index f318958879ba16049741222428fa8cc32412de34..c23ad38fb1d39969c2463ebab919ea165a3b0895 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -39,7 +39,7 @@ namespace R2C2 {
 Layout::Layout(Catalogue &c, Driver *d):
        catalogue(c),
        driver(d),
-       next_turnout_id(0x800)
+       next_turnout_addr(0x800)
 {
        clock.set_rate(60);
 }
@@ -227,18 +227,18 @@ void Layout::remove(BeamGate &g)
        remove(static_cast<Sensor &>(g));
 }
 
-unsigned Layout::allocate_turnout_id()
+unsigned Layout::allocate_turnout_address()
 {
-       set<unsigned> used_ids;
+       set<unsigned> used_addrs;
        const set<Track *> &tracks = objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if((*i)->get_turnout_id())
-                       used_ids.insert((*i)->get_turnout_id());
+               if((*i)->get_turnout_address())
+                       used_addrs.insert((*i)->get_turnout_address());
 
-       unsigned result = next_turnout_id;
-       while(used_ids.count(result))
+       unsigned result = next_turnout_addr;
+       while(used_addrs.count(result))
                ++result;
-       next_turnout_id = result+1;
+       next_turnout_addr = result+1;
 
        return result;
 }
@@ -449,8 +449,8 @@ void Layout::save_dynamic(const string &fn) const
 
        const set<Track *> &tracks = objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(unsigned tid = (*i)->get_turnout_id())
-                       writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path()));
+               if(unsigned taddr = (*i)->get_turnout_address())
+                       writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
 
        for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
        {
@@ -528,8 +528,7 @@ void Layout::Storage<B>::del()
 
 
 Layout::Loader::Loader(Layout &l):
-       DataFile::ObjectLoader<Layout>(l),
-       new_tracks(false)
+       DataFile::ObjectLoader<Layout>(l)
 {
        add("base",  &Layout::base);
        add("beamgate", &Loader::beamgate);
@@ -555,15 +554,14 @@ void Layout::Loader::route()
 
 void Layout::Loader::signal(ArticleNumber art_nr)
 {
-       Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+       Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(art_nr));
        load_sub(*sig);
 }
 
 void Layout::Loader::track(ArticleNumber art_nr)
 {
-       Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
+       Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
        load_sub(*trk);
-       new_tracks = true;
        const set<Track *> &tracks = obj.objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                if(*i!=trk)
@@ -572,7 +570,7 @@ void Layout::Loader::track(ArticleNumber art_nr)
 
 void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
 {
-       Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);
+       Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(art_nr), addr, proto);
        load_sub(*trn);
 }