Add networking library and a remote control program

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

diff --git a/source/libmarklin/locomotive.h b/source/libmarklin/locomotive.h
index 7142701a28e3c5d9e6d5552db523ba00c469e18f..4a6770ec6c9feb701165828286d49bd52b9a1801 100644 (file)
--- a/source/libmarklin/locomotive.h
+++ b/source/libmarklin/locomotive.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_LOCOMOTIVE_H_
 #define LIBMARKLIN_LOCOMOTIVE_H_
 
@@ -9,33 +16,43 @@
 namespace Marklin {
 
 class Control;
+class LocoType;
+class Reply;
 
 class Locomotive
 {
 public:
+       sigc::signal<void, unsigned> signal_speed_changing;
        sigc::signal<void, unsigned> signal_speed_changed;
+       sigc::signal<void, bool> signal_reverse_changed;
+       sigc::signal<void, unsigned, bool> signal_function_changed;
 
-       Locomotive(Control &, unsigned);
-       void     set_speed(unsigned);
-       void     set_reverse(bool);
-       void     set_function(unsigned, bool);
-       unsigned get_address() const   { return addr; }
-       unsigned get_speed() const     { return speed; }
-       bool     get_reverse() const   { return reverse; }
-       bool     get_function(unsigned f) const { return (funcs>>f)&1; }
-       void     refresh_status();
 private:
-       Control  &control;
+       const LocoType &type;
+       Control &control;
        unsigned addr;
        unsigned speed;
-       bool     reverse;
+       bool reverse;
        unsigned funcs;
 
-       void     send_command(bool);
-       void     status_reply(Error, const std::string &);
-       bool     reverse_timeout();
+public:
+       Locomotive(const LocoType &, Control &, unsigned);
+
+       const LocoType &get_type() const { return type; }
+       unsigned get_address() const { return addr; }
+       void set_speed(unsigned);
+       void set_reverse(bool);
+       void set_function(unsigned, bool);
+       unsigned get_speed() const { return speed; }
+       bool get_reverse() const { return reverse; }
+       bool get_function(unsigned f) const { return (funcs>>f)&1; }
+       unsigned get_functions() const { return funcs; }
+       void refresh_status();
+private:
+       void send_command(bool);
+       void status_reply(const Reply &);
+       bool reverse_timeout();
 };
-typedef std::list<Locomotive *> LocomotiveSeq;
 
 } // namespace Marklin