X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fintellibox.h;h=caf84905dbe617524167838468fabeac6a106010;hb=2fb2e58685c521ea76aab9f6d7cffe1186c9814a;hp=4740a1ec6d6f2ccb611a5b5d2b4913eaaca5c37e;hpb=3051264c306adc12b6028061a3257f523c211f81;p=r2c2.git

diff --git a/source/libr2c2/intellibox.h b/source/libr2c2/intellibox.h
index 4740a1e..caf8490 100644
--- a/source/libr2c2/intellibox.h
+++ b/source/libr2c2/intellibox.h
@@ -127,7 +127,7 @@ private:
 	Msp::Time::TimeStamp next_event_query;
 
 public:
-	Intellibox(const std::string &);
+	Intellibox(const Options &);
 
 	virtual void set_power(bool);
 	virtual bool get_power() const { return power; }
@@ -136,28 +136,36 @@ public:
 
 	virtual const char *enumerate_protocols(unsigned) const;
 	virtual unsigned get_protocol_speed_steps(const std::string &) const;
-	virtual void add_loco(unsigned, const std::string &, const VehicleType &);
+	virtual DetectedLocomotive *enumerate_detected_locos(unsigned) const { return 0; }
+	virtual unsigned add_loco(unsigned, const std::string &, const VehicleType &);
+	virtual void remove_loco(unsigned);
 	virtual void set_loco_speed(unsigned, unsigned);
 	virtual void set_loco_reverse(unsigned, bool);
 	virtual void set_loco_function(unsigned, unsigned, bool);
 
-	virtual void add_turnout(unsigned, const TrackType &);
+	virtual unsigned add_turnout(unsigned, const TrackType &);
+	virtual void remove_turnout(unsigned);
 private:
-	void add_turnout(unsigned, unsigned, bool);
+	unsigned add_turnout(unsigned, unsigned, bool);
 	void turnout_state_changed(unsigned, const Turnout &) const;
 public:
 	virtual void set_turnout(unsigned, unsigned);
 	virtual unsigned get_turnout(unsigned) const;
 
-	virtual void add_signal(unsigned, const SignalType &);
+	virtual unsigned add_signal(unsigned, const SignalType &);
+	virtual void remove_signal(unsigned);
 	virtual void set_signal(unsigned, unsigned);
 	virtual unsigned get_signal(unsigned) const;
 
 public:
-	virtual void add_sensor(unsigned);
+	virtual unsigned add_sensor(unsigned);
+	virtual void remove_sensor(unsigned);
 	virtual void set_sensor(unsigned, bool) { }
 	virtual bool get_sensor(unsigned) const;
 
+	virtual const TelemetryInfo *enumerate_telemetry(unsigned) const { return 0; }
+	virtual float get_telemetry_value(const std::string &) const;
+
 	virtual void tick();
 	virtual void flush();