Adapt to revised logging API.

diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index 95c282bef6d92a366b1caa9949da972543fac377..2049453542676d1e8262888ddae5a3d6be8ee42c 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -167,16 +167,16 @@ FGJSBsim::FGJSBsim( double dt )
         TURBULENCE_TYPE_NAMES["ttTustin"]   = FGWinds::ttTustin;
     }
 
-                                // Set up the debugging level
-                                // FIXME: this will not respond to
-                                // runtime changes
+    // Set up the debugging level
+    // FIXME: this will not respond to
+    // runtime changes
 
                                 // if flight is excluded, don't bother
-    if ((logbuf::get_log_classes() & SG_FLIGHT) != 0) {
+    if ((sglog().get_log_classes() & SG_FLIGHT) != 0) {
 
                                 // do a rough-and-ready mapping to
                                 // the levels documented in FGFDMExec.h
-        switch (logbuf::get_log_priority()) {
+        switch (sglog().get_log_priority()) {
         case SG_BULK:
             FGJSBBase::debug_lvl = 0x1f;
             break;

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 2d21e2dc2eac4830f67791e5571b9e3968f800f4..bf62711c8a0775ccbfe34aba47d34aedf9f2123d 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -97,7 +97,7 @@ string loggingResult;
 static const char *
 getLoggingClasses ()
 {
-  sgDebugClass classes = logbuf::get_log_classes();
+  sgDebugClass classes = sglog().get_log_classes();
   loggingResult.clear();
   for (int i = 0; log_class_mappings[i].c != SG_UNDEFD; i++) {
     if ((classes&log_class_mappings[i].c) > 0) {
@@ -113,10 +113,10 @@ getLoggingClasses ()
 static void
 addLoggingClass (const string &name)
 {
-  sgDebugClass classes = logbuf::get_log_classes();
+  sgDebugClass classes = sglog().get_log_classes();
   for (int i = 0; log_class_mappings[i].c != SG_UNDEFD; i++) {
     if (name == log_class_mappings[i].name) {
-      logbuf::set_log_classes(sgDebugClass(classes|log_class_mappings[i].c));
+      sglog().set_log_classes(sgDebugClass(classes|log_class_mappings[i].c));
       return;
     }
   }
@@ -131,7 +131,7 @@ void
 setLoggingClasses (const char * c)
 {
   string classes = c;
-  logbuf::set_log_classes(SG_NONE);
+  sglog().set_log_classes(SG_NONE);
 
   if (classes == "none") {
     SG_LOG(SG_GENERAL, SG_INFO, "Disabled all logging classes");
@@ -139,7 +139,7 @@ setLoggingClasses (const char * c)
   }
 
   if (classes.empty() || classes == "all") { // default
-    logbuf::set_log_classes(SG_ALL);
+    sglog().set_log_classes(SG_ALL);
     SG_LOG(SG_GENERAL, SG_INFO, "Enabled all logging classes: "
           << getLoggingClasses());
     return;
@@ -170,7 +170,7 @@ setLoggingClasses (const char * c)
 static const char *
 getLoggingPriority ()
 {
-  switch (logbuf::get_log_priority()) {
+  switch (sglog().get_log_priority()) {
   case SG_BULK:
     return "bulk";
   case SG_DEBUG:
@@ -183,7 +183,7 @@ getLoggingPriority ()
     return "alert";
   default:
     SG_LOG(SG_GENERAL, SG_WARN, "Internal: Unknown logging priority number: "
-          << logbuf::get_log_priority());
+          << sglog().get_log_priority());
     return "unknown";
   }
 }
@@ -199,15 +199,15 @@ setLoggingPriority (const char * p)
       return;
   string priority = p;
   if (priority == "bulk") {
-    logbuf::set_log_priority(SG_BULK);
+    sglog().set_log_priority(SG_BULK);
   } else if (priority == "debug") {
-    logbuf::set_log_priority(SG_DEBUG);
+    sglog().set_log_priority(SG_DEBUG);
   } else if (priority.empty() || priority == "info") { // default
-    logbuf::set_log_priority(SG_INFO);
+    sglog().set_log_priority(SG_INFO);
   } else if (priority == "warn") {
-    logbuf::set_log_priority(SG_WARN);
+    sglog().set_log_priority(SG_WARN);
   } else if (priority == "alert") {
-    logbuf::set_log_priority(SG_ALERT);
+    sglog().set_log_priority(SG_ALERT);
   } else {
     SG_LOG(SG_GENERAL, SG_WARN, "Unknown logging priority " << priority);
   }