Make LCD output selectable at runtime through an extra I/O pin

[r2c2.git] / source / libmarklin / aicontrol.h

diff --git a/source/libmarklin/aicontrol.h b/source/libmarklin/aicontrol.h
index 90906caaea98bd091515317a92e877c771bae9f6..462a114ac00bbe2cd04078fd0dad3461a07a7abd 100644 (file)
--- a/source/libmarklin/aicontrol.h
+++ b/source/libmarklin/aicontrol.h
@@ -10,7 +10,6 @@ Distributed under the GPL
 
 #include <sigc++/trackable.h>
 #include "controller.h"
-#include "traincontrol.h"
 
 namespace Marklin {
 
@@ -20,8 +19,8 @@ class AIControl: public Controller, public sigc::trackable
 {
 private:
        Train &train;
-       Controller *next_model;
-       TrainControl target_speed;
+       Controller *next_ctrl;
+       Control target_speed;
        bool blocked;
        bool approach;
 
@@ -30,7 +29,7 @@ public:
        virtual ~AIControl();
 
        virtual void set_control(const std::string &, float);
-       virtual const TrainControl &get_control(const std::string &) const;
+       virtual const Control &get_control(const std::string &) const;
 
        virtual float get_speed() const;
        virtual bool get_reverse() const;
@@ -39,7 +38,7 @@ public:
        virtual void tick(const Msp::Time::TimeDelta &);
 
 private:
-       void control_changed(const TrainControl &);
+       void control_changed(const Control &);
        void arrived();
 };