Changeset 7737 in orxonox.OLD for trunk/src/lib/shell/shell_buffer.cc

Timestamp:

May 19, 2006, 11:38:34 PM (19 years ago)

Author:

bensch

Message:

Using MultiLine-Text in the Shell. This is much faster, and Nicer

File:

• trunk/src/lib/shell/shell_buffer.cc (modified) (5 diffs)

trunk/src/lib/shell/shell_buffer.cc

@@ -17 +17 @@
 
 #include "shell_buffer.h"
+
+#include <stdarg.h>
+
 #include "debug.h"
 #include "shell.h"
+#include "lib/util/threading.h"
 
 namespace OrxShell
@@ -39 +43 @@
 
   ShellBuffer* ShellBuffer::singletonRef = NULL;
-  SDL_mutex* ShellBuffer::bufferMutex = NULL;
+  std::list<std::string> ShellBuffer::buffer;
 
   /**
@@ -48 +52 @@
     if (this->shell != NULL)
       delete this->shell;
-
-    this->flush();
-
-    if (ShellBuffer::bufferMutex != NULL)
-      SDL_DestroyMutex(ShellBuffer::bufferMutex);
-    ShellBuffer::bufferMutex = NULL;
 
     ShellBuffer::singletonRef = NULL;
@@ -99 +97 @@
     va_start(arguments, line);
 
-    if (ShellBuffer::bufferMutex == NULL)
-      ShellBuffer::bufferMutex = SDL_CreateMutex();
+    static OrxThread::Mutex ShellBuffer__bufferMutex;
 
-    SDL_mutexP(ShellBuffer::bufferMutex);
+    OrxThread::MutexLock bufferLock(&ShellBuffer__bufferMutex);
 #if DEBUG_LEVEL < 3
     if (ShellBuffer::singletonRef == NULL)
@@ -113 +110 @@
 #endif
       ShellBuffer::singletonRef->addBufferLine(line, arguments);
-    SDL_mutexV(ShellBuffer::bufferMutex);
     return true;
   }