#346 related: missing status message for property server

[flightgear.git] / src / Network / joyclient.cxx

diff --git a/src/Network/joyclient.cxx b/src/Network/joyclient.cxx
index 4805d639c059a9aaf3d2869066d0456a66bbc883..b163cb00ee69b175341d1d9c27c75438e04315fe 100644 (file)
--- a/src/Network/joyclient.cxx
+++ b/src/Network/joyclient.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  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,15 +16,19 @@
 //
 // 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$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
 
-#include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
+#include <Main/globals.hxx>
 
 #include "joyclient.hxx"
 
@@ -39,7 +43,7 @@ FGJoyClient::~FGJoyClient() {
 // open hailing frequencies
 bool FGJoyClient::open() {
     if ( is_enabled() ) {
-       FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel " 
+       SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel " 
                << "is already in use, ignoring" );
        return false;
     }
@@ -47,7 +51,7 @@ bool FGJoyClient::open() {
     SGIOChannel *io = get_io_channel();
 
     if ( ! io->open( get_direction() ) ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." );
+       SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
        return false;
     }
 
@@ -63,16 +67,16 @@ bool FGJoyClient::process() {
     int length = sizeof(int[2]);
 
     if ( get_direction() == SG_IO_OUT ) {
-       FG_LOG( FG_IO, FG_ALERT, "joyclient protocol is read only" );
+       SG_LOG( SG_IO, SG_ALERT, "joyclient protocol is read only" );
        return false;
     } else if ( get_direction() == SG_IO_IN ) {
-       FG_LOG( FG_IO, FG_DEBUG, "Searching for data." );
+       SG_LOG( SG_IO, SG_DEBUG, "Searching for data." );
        if ( io->get_type() == sgFileType ) {
            if ( io->read( (char *)(& buf), length ) == length ) {
-               FG_LOG( FG_IO, FG_DEBUG, "Success reading data." );
+               SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
                int *msg;
                msg = (int *)buf;
-               FG_LOG( FG_IO, FG_DEBUG, "X = " << msg[0] << " Y = "
+               SG_LOG( SG_IO, SG_DEBUG, "X = " << msg[0] << " Y = "
                        << msg[1] );
                double aileron = ((double)msg[0] / 2048.0) - 1.0;
                double elevator = ((double)msg[1] / 2048.0) - 1.0;
@@ -82,15 +86,15 @@ bool FGJoyClient::process() {
                if ( fabs(elevator) < 0.05 ) {
                    elevator = 0.0;
                }
-               controls.set_aileron( aileron );
-               controls.set_elevator( -elevator );
+               globals->get_controls()->set_aileron( aileron );
+               globals->get_controls()->set_elevator( -elevator );
            }
        } else {
            while ( io->read( (char *)(& buf), length ) == length ) {
-               FG_LOG( FG_IO, FG_DEBUG, "Success reading data." );
+               SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
                int *msg;
                msg = (int *)buf;
-               FG_LOG( FG_IO, FG_DEBUG, "X = " << msg[0] << " Y = "
+               SG_LOG( SG_IO, SG_DEBUG, "X = " << msg[0] << " Y = "
                        << msg[1] );
                double aileron = ((double)msg[0] / 2048.0) - 1.0;
                double elevator = ((double)msg[1] / 2048.0) - 1.0;
@@ -100,8 +104,8 @@ bool FGJoyClient::process() {
                if ( fabs(elevator) < 0.05 ) {
                    elevator = 0.0;
                }
-               controls.set_aileron( aileron );
-               controls.set_elevator( -elevator );
+               globals->get_controls()->set_aileron( aileron );
+               globals->get_controls()->set_elevator( -elevator );
            }
        }
     }