Changeset 6007

Timestamp:

Oct 30, 2009, 5:26:28 PM (14 years ago)

Author:

rgrieder

Message:

Fixed IOConsole partly and fixed two problems in PathConfig and OutputHandler

Location:

code/branches/console/src/libraries

Files:

• core/IOConsole.cc (modified) (2 diffs)
• core/IOConsole.h (modified) (2 diffs)
• core/PathConfig.cc (modified) (1 diff)
• util/OutputHandler.cc (modified) (4 diffs)

code/branches/console/src/libraries/core/IOConsole.cc

@@ -54 +54 @@
 #ifdef ORXONOX_PLATFORM_UNIX
 
-    termios* IOConsole::originalTerminalSettings_;
-
     namespace EscapeMode
     {
@@ -69 +67 @@
         : shell_(new Shell("IOConsole", false))
         , buffer_(shell_->getInputBuffer())
+        , originalTerminalSettings_(new termios())
         , bStatusPrinted_(false)
     {
-        this->originalTerminalSettings_ = new termios();
         this->setTerminalMode();
         this->shell_->registerListener(this);

code/branches/console/src/libraries/core/IOConsole.h

@@ -55 +55 @@
 
         void setTerminalMode();
-        static void resetTerminalMode();
+        void resetTerminalMode();
         int getTerminalSize(int* x, int* y);
 
@@ -72 +72 @@
         Shell*                  shell_;
         InputBuffer*            buffer_;
-        static termios*         originalTerminalSettings_;
+        termios*                originalTerminalSettings_;
         bool                    bPrintStatusLine_;
         bool                    bStatusPrinted_;

code/branches/console/src/libraries/core/PathConfig.cc

@@ -263 +263 @@
         putenv(const_cast<char*>(("PATH=" + pathVariable + ";" + modulePath_.string()).c_str()));
 
+        // Make sure the path exists, otherwise don't load modules
+        if (!boost::filesystem::exists(modulePath_))
+            return modulePaths;
+
         boost::filesystem::directory_iterator file(modulePath_);
         boost::filesystem::directory_iterator end;

code/branches/console/src/libraries/util/OutputHandler.cc

@@ -70 +70 @@
             called from getInstance!)
         */
-        LogFileWriter(OutputHandler& outputHandler)
+        LogFileWriter()
             : OutputListener(OutputHandler::logFileOutputListenerName_s)
         {
@@ -92 +92 @@
 
             this->outputStream_ = &this->logFile_;
-            // Use default level until we get the configValue from the Core
-            this->setSoftDebugLevel(OutputLevel::Debug);
-            outputHandler.registerOutputListener(this);
         }
 
@@ -147 +144 @@
             called from getInstance!)
         */
-        MemoryLogWriter(OutputHandler& outputHandler)
+        MemoryLogWriter()
             : OutputListener("memoryLog")
         {
             this->outputStream_ = &this->buffer_;
-            // We capture as much input as the listener with the highest level
-            this->setSoftDebugLevel(OutputHandler::getSoftDebugLevel());
-            outputHandler.registerOutputListener(this);
         }
 
@@ -182 +176 @@
         : outputLevel_(OutputLevel::Verbose)
     {
-        this->logFile_ = new LogFileWriter(*this);
-        this->output_  = new MemoryLogWriter(*this);
+        this->logFile_ = new LogFileWriter();
+        // Use default level until we get the configValue from the Core
+        this->logFile_->softDebugLevel_ = OutputLevel::Debug;
+        this->registerOutputListener(this->logFile_);
+
+        this->output_  = new MemoryLogWriter();
+        // We capture as much input as the listener with the highest level
+        this->output_->softDebugLevel_ = getSoftDebugLevel();
+        this->registerOutputListener(this->output_);
     }