Changeset 3528 in orxonox.OLD for orxonox/trunk/src/track_manager.cc

Timestamp:

Mar 13, 2005, 9:09:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: TrackNode gets initialized by TrackManager now.

File:

• orxonox/trunk/src/track_manager.cc (modified) (5 diffs)

orxonox/trunk/src/track_manager.cc

@@ -19 +19 @@
 #include "p_node.h"
 
+#include "track_node.h"
+
 #include <stdarg.h>
-#include "p_node.h"
 
 using namespace std;
@@ -206 +207 @@
 {
   this->setClassName ("TrackManager");
+  
+  singletonRef = this;
 
   PRINTF(3)("Initializing the TrackManager\n");
@@ -214 +217 @@
   this->maxTime = 0;
   this->trackElemCount = 1;
-  this->bindSlave = NULL;
+  this->bindSlave = TrackNode::getInstance();
 }
 
@@ -242 +245 @@
 TrackManager* TrackManager::getInstance(void) 
 {
-  if (TrackManager::singletonRef)
-    return TrackManager::singletonRef;
-  else
-    return TrackManager::singletonRef = new TrackManager();
+  if (!singletonRef)
+    singletonRef = new TrackManager();
+  return singletonRef;
 }
 
@@ -694 +696 @@
 void TrackManager::setBindSlave(PNode* bindSlave)
 {
-  if (!this->bindSlave)
+  if (this->bindSlave == TrackNode::getInstance() || bindSlave == TrackNode::getInstance())
     this->bindSlave = bindSlave;
+  else
+    PRINTF(2)("Already a Bindslave set that is not the TrackNode itself. Not updating\n");
 }