X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Ftrainpanel.h;h=e1464e36331f4bd8923d141644a146ce3eeb7ea8;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=b969af406d2becef314f48b114823882801d4f3d;hpb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;p=r2c2.git diff --git a/source/remote/trainpanel.h b/source/remote/trainpanel.h index b969af4..e1464e3 100644 --- a/source/remote/trainpanel.h +++ b/source/remote/trainpanel.h @@ -1,7 +1,7 @@ /* $Id$ This file is part of the MSP Märklin suite -Copyright © 2009 Mikkosoft Productions, Mikko Rasa +Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -16,6 +16,8 @@ Distributed under the GPL #include "network/client.h" #include "network/train.h" +class Remote; + class TrainPanel: public Gtk::Expander { private: @@ -26,6 +28,7 @@ private: RouteRecord(); }; + Remote &remote; Marklin::Client &client; Marklin::NetTrain &train; Gtk::Scale *scl_speed; @@ -36,12 +39,11 @@ private: std::map chk_funcs; public: - TrainPanel(Marklin::Client &, Marklin::NetTrain &); + TrainPanel(Remote &, Marklin::Client &, Marklin::NetTrain &); private: void name_changed(const std::string &); void status_changed(const std::string &); - void speed_changed(unsigned); - void reverse_changed(bool); + void control_changed(const std::string &, float); void function_changed(unsigned, bool); void route_changed(const std::string &); void ui_speed_changed();