X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.h;h=406e1a66fce4440110bb2420a58b7b0905cd9217;hb=54d520566470a4b21b2a6eac3e2943d6305dcfa1;hp=d15462ec61d8855d367dd899d289d58a89363eef;hpb=fcaa883538f98bac71ba1a90f98950bb2aa08d88;p=r2c2.git

diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h
index d15462e..406e1a6 100644
--- a/source/engineer/trainpanel.h
+++ b/source/engineer/trainpanel.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef TRAINPANEL_H_
 #define TRAINPANEL_H_
 
@@ -14,8 +7,9 @@ Distributed under the GPL
 #include <msp/gltk/label.h>
 #include <msp/gltk/panel.h>
 #include <msp/gltk/toggle.h>
-#include "libmarklin/route.h"
-#include "libmarklin/train.h"
+#include "libr2c2/route.h"
+#include "libr2c2/train.h"
+#include "libr2c2/trainstatus.h"
 
 class Engineer;
 
@@ -23,7 +17,8 @@ class TrainPanel: public Msp::GLtk::Panel, public sigc::trackable
 {
 private:
 	Engineer &engineer;
-	Marklin::Train &train;
+	R2C2::Train &train;
+	R2C2::TrainStatus status;
 	Msp::GLtk::Panel *pnl_basic;
 	Msp::GLtk::Panel *pnl_extra;
 	Msp::GLtk::Button *btn_expand;
@@ -39,13 +34,13 @@ private:
 	bool expanded;
 
 public:
-	TrainPanel(Engineer &, const Msp::GLtk::Resources &, Marklin::Train &);
+	TrainPanel(Engineer &, R2C2::Train &);
 	void expand(bool = true);
 
 private:
-	void train_control_changed(const std::string &, float);
+	void ai_event(const R2C2::TrainAI::Message &);
 	void train_function_changed(unsigned, bool);
-	void train_route_changed(const Marklin::Route *);
+	void train_route_changed(const R2C2::Route *);
 	void train_status_changed(const std::string &);
 	void place_clicked();
 	void take_clicked();
@@ -58,8 +53,8 @@ private:
 	void speed_slider_changed(double);
 	void forward_toggled(bool);
 	void func_toggled(bool, unsigned);
-	void place(Marklin::Track *, unsigned);
-	void go_to(Marklin::Track *, unsigned);
+	void place(R2C2::Track *, unsigned);
+	void go_to(R2C2::Track *, unsigned);
 };
 
 #endif