Updated adf property names.

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

diff --git a/src/Network/native.cxx b/src/Network/native.cxx
index 9418a7884366b96a95d797b555c0edaa711293a9..c2e94190e42e0bb5185188f42997f8bc085054cf 100644 (file)
--- a/src/Network/native.cxx
+++ b/src/Network/native.cxx
@@ -21,12 +21,9 @@
 // $Id$
 
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
 
-#include <Time/fg_time.hxx>
-
-#include "iochannel.hxx"
 #include "native.hxx"
 
 
@@ -40,15 +37,15 @@ FGNative::~FGNative() {
 // open hailing frequencies
 bool FGNative::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;
     }
 
-    FGIOChannel *io = get_io_channel();
+    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;
     }
 
@@ -60,20 +57,27 @@ bool FGNative::open() {
 
 // process work for this port
 bool FGNative::process() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
     int length = sizeof(*cur_fdm_state);
 
-    if ( get_direction() == out ) {
+    if ( get_direction() == SG_IO_OUT ) {
        // cout << "size of cur_fdm_state = " << length << endl;
        buf = *cur_fdm_state;
        if ( ! io->write( (char *)(& buf), length ) ) {
-           FG_LOG( FG_IO, FG_ALERT, "Error writing data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
            return false;
        }
-    } else if ( get_direction() == in ) {
-       while ( io->read( (char *)(& buf), length ) == length ) {
-           FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
-           *cur_fdm_state = buf;
+    } else if ( get_direction() == SG_IO_IN ) {
+       if ( io->get_type() == sgFileType ) {
+           if ( io->read( (char *)(& buf), length ) == length ) {
+               SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
+               *cur_fdm_state = buf;
+           }
+       } else {
+           while ( io->read( (char *)(& buf), length ) == length ) {
+               SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
+               *cur_fdm_state = buf;
+           }
        }
     }
 
@@ -83,7 +87,7 @@ bool FGNative::process() {
 
 // close the channel
 bool FGNative::close() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     set_enabled( false );