X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Fremote.h;h=0d6d413d2e2db93ff38a6874a1cbfba1c9f34797;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=4599a139af32989b2c0c4212168c8d15694cac29;hpb=010d8321e982d1684fcbff5bf6fc2bdec7cb7bae;p=r2c2.git diff --git a/source/remote/remote.h b/source/remote/remote.h index 4599a13..0d6d413 100644 --- a/source/remote/remote.h +++ b/source/remote/remote.h @@ -1,7 +1,7 @@ /* $Id$ -This file is part of the MSP Märklin suite -Copyright © 2009 Mikkosoft Productions, Mikko Rasa +This file is part of R²C² +Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,24 +14,29 @@ Distributed under the GPL #include #include "network/client.h" +class TrainPanel; + class Remote: public Msp::Application { private: Msp::IO::EventDispatcher event_disp; - Marklin::Catalogue catalogue; - Marklin::Client client; + R2C2::Catalogue catalogue; + R2C2::Client client; Gtk::Main gtk; Gtk::Window window; Gtk::Box *train_box; + std::vector train_panels; static Msp::Application::RegApp reg; public: Remote(int argc, char **argv); + + const R2C2::Catalogue &get_catalogue() const { return catalogue; } private: void tick(); - void train_added(Marklin::NetTrain &); + void train_added(R2C2::NetTrain &); }; #endif