Merge branch 'jmt/track-bug' into next

[flightgear.git] / src / Network / native_ctrls.hxx

diff --git a/src/Network/native_ctrls.hxx b/src/Network/native_ctrls.hxx
index db47daff388ea58f136cc4096f9cf0d264cc7991..fe90e79d9509479b545814b58eaddc025cfea6b2 100644 (file)
--- a/src/Network/native_ctrls.hxx
+++ b/src/Network/native_ctrls.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started July 2001.
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -27,19 +27,17 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
-
-#include <Controls/controls.hxx>
+#include <string>
 
+#include <Aircraft/controls.hxx>
 #include "protocol.hxx"
-#include "raw_ctrls.hxx"
-
-SG_USING_STD(string);
+#include "net_ctrls.hxx"
 
+using std::string;
 
 class FGNativeCtrls : public FGProtocol {
 
-    FGRawCtrls raw_ctrls;
+    FGNetCtrls net_ctrls;
     FGControls ctrls;
 
     int length;
@@ -60,6 +58,17 @@ public:
 };
 
 
+// Helper functions which may be useful outside this class
+
+// Populate the FGNetCtrls structure from the property tree.
+void FGProps2NetCtrls( FGNetCtrls *net, bool honor_freezes,
+                       bool net_byte_order );
+
+// Update the property tree from the FGNetCtrls structure.
+void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
+                       bool net_byte_order );
+
+
 #endif // _FG_NATIVE_CTRLS_HXX