X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcontrol.h;h=a041e957caaf1b009ee216b43ef34e1794cf52e7;hb=dcfa1e9503b7e97b61396d7458f0b2e5896779cd;hp=a91186059b033ed1052ea80408f9a7c0e474e8db;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/control.h b/source/libmarklin/control.h
index a911860..a041e95 100644
--- a/source/libmarklin/control.h
+++ b/source/libmarklin/control.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -20,12 +20,17 @@ Distributed under the GPL
 namespace Marklin {
 
 class Command;
+class Reply;
 
 class Control
 {
+public:
+	sigc::signal<void, bool> signal_power_event;
+	sigc::signal<void, unsigned, bool> signal_turnout_event;
+	sigc::signal<void, unsigned, bool> signal_sensor_event;
+
 private:
-	int  serial_fd;
-	bool p50_enabled;
+	int serial_fd;
 	bool power;
 	std::list<Command> queue;
 	std::map<unsigned, Turnout *> turnouts;
@@ -37,37 +42,36 @@ private:
 	Msp::Time::Timer timer;
 
 public:
-	sigc::signal<void, bool> signal_power_event;
-	sigc::signal<void, unsigned, bool> signal_turnout_event;
-	sigc::signal<void, unsigned, bool> signal_sensor_event;
-
 	Control();
 	~Control();
 
-	void       set_power(bool);
-	bool       get_power() const { return power; }
-	void       set_debug(bool);
-	const std::map<unsigned, Sensor *> &get_sensors() const { return sensors; }
-	unsigned   get_queue_length() const { return queue.size(); }
-	void       open(const std::string &);
-	Command    &command(const std::string &);
+	void open(const std::string &);
+	void set_debug(bool);
+	void set_power(bool);
+	bool get_power() const { return power; }
+	Command &command(Cmd);
+	Command &command(Cmd, unsigned char);
+	Command &command(Cmd, const unsigned char *, unsigned);
+	unsigned get_queue_length() const { return queue.size(); }
+	void flush();
 
-	void       add_turnout(Turnout &);
-	Turnout    &get_turnout(unsigned) const;
-	void       add_locomotive(Locomotive &);
+	void add_turnout(Turnout &);
+	Turnout &get_turnout(unsigned) const;
+	const std::map<unsigned, Turnout *> &get_turnouts() const { return turnouts; }
+	void add_locomotive(Locomotive &);
 	Locomotive &get_locomotive(unsigned) const;
-	void       add_sensor(Sensor &);
-	Sensor     &get_sensor(unsigned) const;
+	const std::map<unsigned, Locomotive *> &get_locomotives() const { return locomotives; }
+	void add_sensor(Sensor &);
+	Sensor &get_sensor(unsigned) const;
+	const std::map<unsigned, Sensor *> &get_sensors() const { return sensors; }
 
-	void       tick();
+	void tick();
 	Msp::Time::Timer::Slot &set_timer(const Msp::Time::TimeDelta &);
 private:
-	void read_all(int, char *, int);
-	std::string read_reply(Cmd);
-	void status_done(Error, const std::string &);
-	void event_query_done(Error, const std::string &);
-	void turnout_event_done(Error, const std::string &);
-	void sensor_event_done(Error, const std::string &);
+	void status_done(const Reply &);
+	void event_query_done(const Reply &);
+	void turnout_event_done(const Reply &);
+	void sensor_event_done(const Reply &);
 };
 
 } // namespace Marklin