Changeset 1313 for code/branches/console/src/core/OutputBuffer.cc

Timestamp:

May 17, 2008, 3:58:19 AM (16 years ago)

Author:

landauf

Message:

• implemented Shell, but not yet linked with the graphical console
• added new features (cursor, OIS::KeyCode listener) to InputBuffer
• changed some includes to avoid circular header-dependencies in OrxonoxClass and Shell

File:

• code/branches/console/src/core/OutputBuffer.cc (modified) (3 diffs)

code/branches/console/src/core/OutputBuffer.cc

@@ -33 +33 @@
 namespace orxonox
 {
-    OutputBuffer& OutputBuffer::getOutputBuffer()
-    {
-        static OutputBuffer instance;
-        return instance;
-    }
-
     void OutputBuffer::registerListener(OutputBufferListener* listener)
     {
-        this->listeners_.insert(listener);
+        this->listeners_.insert(this->listeners_.end(), listener);
     }
 
     void OutputBuffer::unregisterListener(OutputBufferListener* listener)
     {
-        std::set<OutputBufferListener*>::iterator it = this->listeners_.find(listener);
-        if (it != this->listeners_.end())
-            this->listeners_.erase(it);
+        for (std::list<OutputBufferListener*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); )
+        {
+            if ((*it) == listener)
+                this->listeners_.erase(it++);
+            else
+                ++it;
+        }
     }
 
@@ -63 +61 @@
             this->stream_.flush();
 
+        // Return true if this was a whole new line, ended by \n
         return (!eof);
     }
@@ -68 +67 @@
     void OutputBuffer::callListeners()
     {
-        for (std::set<OutputBufferListener*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
-            (*it)->bufferChanged();
+        for (std::list<OutputBufferListener*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
+            (*it)->outputChanged();
     }
 }