Changeset 14083 for trunk/FACT++

Timestamp:

06/05/12 17:23:36 (12 years ago)

Author:

tbretz

Message:

Moved switching off and on of the logging before and after a sleep to Lock() and Unlock() respectively.

Location:

trunk/FACT++/src

Files:

• Console.cc (modified) (3 diffs)
• Console.h (modified) (3 diffs)

trunk/FACT++/src/Console.cc

@@ -82 +82 @@
 }
 
+void Console::Lock()
+{
+    // FIXME: Check missing
+    fLogO.Display(true);
+    fLogO.SetBacklog(false);
+    fLogO.SetNullOutput(false);
+}
+
+void Console::Unlock()
+{
+    // FIXME: Check missing
+    fLogO.SetNullOutput(true);
+    fLogO.SetBacklog(true);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -96 +111 @@
     if (str.substr(0, 3)==".w ")
     {
-        fLogO.Display(true);
-        fLogO.SetBacklog(false);
-        fLogO.SetNullOutput(false);
+        Lock();
         usleep(stoul(str.substr(3))*1000);
-        fLogO.SetNullOutput(true);
-        fLogO.SetBacklog(true);
+        Unlock();
         return true;
     }
@@ -205 +217 @@
 // **************************************************************************
 
+ConsoleStream::~ConsoleStream()
+{
+    fLogO.Display();
+}
 
 // --------------------------------------------------------------------------

trunk/FACT++/src/Console.h

@@ -14 +14 @@
 public:
     ConsoleStream(const char *name);
+    ~ConsoleStream();
 
     void SetNullOutput(bool null) { fLogO.SetNullOutput(null); }
@@ -24 +25 @@
     const WindowLog &GetStreamIn()  const { return fLogO; }
 
+    void Lock() { }
     void Run(const char * = 0);
+    void Unlock() { }
 };
 
@@ -59 +62 @@
     bool PrintKeyBindings();
 
+    void Lock();
     bool Process(const std::string &str);
+    void Unlock();
 
     std::string GetLinePrompt() const;