[Gnash-commit] gnash ChangeLog libbase/log.cpp libbase/log.h

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/10 07:24:02

Modified files:
        .              : ChangeLog 
        libbase        : log.cpp log.h 

Log message:
                * libbase/log.{cpp,h}: allow registering callback to receive
                  log messages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6233&r2=1.6234
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.75&r2=1.76

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6233
retrieving revision 1.6234
diff -u -b -r1.6233 -r1.6234
--- ChangeLog   10 Apr 2008 03:52:06 -0000      1.6233
+++ ChangeLog   10 Apr 2008 07:24:01 -0000      1.6234
@@ -1,4 +1,10 @@
+2008-04-10 Benjamin Wolsey <address@hidden>
+
+       * libbase/log.{cpp,h}: allow registering callback to receive
+         log messages.
+
 2008-04-10 Zou Lunkai <address@hidden>
+
        * server/parser/movie_def_impl.{h, cpp}, 
server/parser/movie_definition.h,
          server/parser/sprite_definition.{h,cpp},
          server/swf/PlaceObject2Tag.cpp, RemoveObjectTag.cpp,

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- libbase/log.cpp     29 Mar 2008 20:01:58 -0000      1.74
+++ libbase/log.cpp     10 Apr 2008 07:24:01 -0000      1.75
@@ -173,6 +173,7 @@
 void
 LogFile::log(const std::string& msg)
 {
+
        boost::mutex::scoped_lock lock(_ioMutex);
 
        if (_stamp == true )
@@ -190,6 +191,11 @@
                        _outstream << msg << endl;
                }
        }
+       
+       if (_listener)
+       {
+           (*_listener)(msg);
+       }
 }
 
 void
@@ -220,7 +226,8 @@
        _parserdump(false),
        _state(CLOSED),
        _stamp(true),
-       _write(false)
+       _write(false),
+       _listener(NULL)
 {
 }
 

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- libbase/log.h       29 Mar 2008 20:01:58 -0000      1.75
+++ libbase/log.h       10 Apr 2008 07:24:02 -0000      1.76
@@ -160,6 +160,10 @@
         return _write;
     }
 
+    typedef void (*logListener)(const std::string& s);
+    
+    void registerLogCallback(logListener l) { _listener = l; }
+
 private:
     
     /// Open the specified file to write logs on disk
@@ -210,11 +214,10 @@
 
     std::string                 _filespec;
 
-    /// For the ostream << operator
-    friend std::ostream & operator << (std::ostream &os, LogFile& e);
-
     std::string _logFilename;
 
+    logListener _listener;
+
 };
 
 /// This heap of steaming preprocessor code magically converts