Melchior FRANZ:

[flightgear.git] / src / Cockpit / radiostack.cxx

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 6566daf7e8d9e9d929c7a6c226a88dd0979b09c8..09986f09621f052ec3d6e1d44db55863031ee3f8 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.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
@@ -31,10 +31,7 @@
 #include <simgear/math/sg_random.h>
 
 #include <Aircraft/aircraft.hxx>
-#include <Navaids/ilslist.hxx>
-#include <Navaids/mkrbeacons.hxx>
 #include <Navaids/navlist.hxx>
-#include <Time/FGEventMgr.hxx>
 
 #include "radiostack.hxx"
 
@@ -53,11 +50,11 @@ FGRadioStack::FGRadioStack() {
 // Destructor
 FGRadioStack::~FGRadioStack() 
 {
-    adf.unbind();
-    beacon.unbind();
+    //adf.unbind();
+    //beacon.unbind();
     navcom1.unbind();
     navcom2.unbind();
-    xponder.unbind();
+    //xponder.unbind();
 }
 
 
@@ -70,43 +67,42 @@ FGRadioStack::init ()
     navcom2.set_bind_index( 1 );
     navcom2.init();
 
-    adf.init();
-    beacon.init();
-    xponder.init();
+    //adf.init();
+    //beacon.init();
+    //xponder.init();
 
     search();
     update(0);                 // FIXME: use dt
 
     // Search radio database once per second
-    global_events.Register( "fgRadioSearch()",
-                           current_radiostack, &FGRadioStack::search,
-                           1000 );
+    globals->get_event_mgr()->addTask( "fgRadioSearch()", current_radiostack,
+                                       &FGRadioStack::search, 1 );
 }
 
 
 void
 FGRadioStack::bind ()
 {
-    adf.bind();
-    beacon.bind();
-    dme.bind();
+    //adf.bind();
+    //beacon.bind();
+    //dme.bind();
     navcom1.set_bind_index( 0 );
     navcom1.bind();
     navcom2.set_bind_index( 1 );
     navcom2.bind();
-    xponder.bind();
+    //xponder.bind();
 }
 
 
 void
 FGRadioStack::unbind ()
 {
-    adf.unbind();
-    beacon.unbind();
-    dme.unbind();
+    //adf.unbind();
+    //beacon.unbind();
+    //dme.unbind();
     navcom1.unbind();
     navcom2.unbind();
-    xponder.unbind();
+    //xponder.unbind();
 }
 
 
@@ -114,22 +110,22 @@ FGRadioStack::unbind ()
 void 
 FGRadioStack::update(double dt) 
 {
-    adf.update( dt );
-    beacon.update( dt );
+    //adf.update( dt );
+    //beacon.update( dt );
     navcom1.update( dt );
     navcom2.update( dt );
-    dme.update( dt );           // dme is updated after the navcom's
-    xponder.update( dt );
+    //dme.update( dt );           // dme is updated after the navcom's
+    //xponder.update( dt );
 }
 
 
 // Update current nav/adf radio stations based on current postition
 void FGRadioStack::search() 
 {
-    adf.search();
-    beacon.search();
+    //adf.search();
+    //beacon.search();
     navcom1.search();
     navcom2.search();
-    dme.search();
-    xponder.search();
+    //dme.search();
+    //xponder.search();
 }