X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fjoyclient.cxx;h=954b4e55c7e251d84c61b86a74f5f2c0d57d5c04;hb=4606f96e139204d5b2d76ee93c3b0c66885b5f5f;hp=4805d639c059a9aaf3d2869066d0456a66bbc883;hpb=4c0a3b3db43f5be847129b77d71f35036c452ad1;p=flightgear.git

diff --git a/src/Network/joyclient.cxx b/src/Network/joyclient.cxx
index 4805d639c..954b4e55c 100644
--- a/src/Network/joyclient.cxx
+++ b/src/Network/joyclient.cxx
@@ -39,7 +39,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 +47,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 +63,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 +82,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 +100,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 );
 	    }
 	}
     }