[Gnash-commit] /srv/bzr/gnash/trunk r12076: plugin.cpp: Restore debugging level.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12076
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Fri 2010-03-19 01:27:58 +0100
message:
  plugin.cpp: Restore debugging level.
  gui/gui.cpp: Don't convert range from int to float.
  gui/gui.h: Add some documentation for FD watching API.
  gui/gtksup.h: Remove defunct documentation.
modified:
  gui/gtksup.h
  gui/gui.cpp
  gui/gui.h
  plugin/plugin.cpp

=== modified file 'gui/gtksup.h'
--- a/gui/gtksup.h      2010-03-16 18:04:59 +0000
+++ b/gui/gtksup.h      2010-03-19 00:27:58 +0000
@@ -94,18 +94,6 @@
     virtual int getScreenResY();
     virtual double getScreenDPI();
     
-    /// Add a listener with default priority that listens for IN and HUP
-    /// events on a file descriptor.
-    //
-    /// @param fd The file descriptor to poll.
-    /// @param callback A pointer to a callback function with the following
-    ///                 signature:
-    ///        bool func(void*, int, void* data)
-    ///        The first and second arguments should be ignored.
-    ///        The last argument is a user-specified pointer. The
-    ///        callback should return false if the listener is to be removed.
-    /// @param data A pointer to a user-defined data structure.
-    /// @return true on success, false on failure.
     bool watchFD(int fd);
 
     /// Grab focus so to receive all key events

=== modified file 'gui/gui.cpp'
--- a/gui/gui.cpp       2010-03-16 18:04:59 +0000
+++ b/gui/gui.cpp       2010-03-19 00:27:58 +0000
@@ -1081,7 +1081,7 @@
 Gui::setInvalidatedRegions(const InvalidatedRanges& ranges)
 {
     // fallback to single regions
-    geometry::Range2d<float> full = ranges.getFullArea();
+    geometry::Range2d<int> full = ranges.getFullArea();
     
     SWFRect bounds;
     

=== modified file 'gui/gui.h'
--- a/gui/gui.h 2010-03-17 20:14:06 +0000
+++ b/gui/gui.h 2010-03-19 00:27:58 +0000
@@ -173,8 +173,16 @@
       _interval = interval;
     }
 
+    /// Instructs the Gui to monitor a file descriptor.
+    //
+    /// @param fd The file descriptor to monitor
+    /// @param callback The callback to fire
     void setFDCallback(int fd, boost::function<void ()> callback);
 
+    /// Calls the callback function registered for a file descriptor.
+    //
+    /// @param fd The file descriptor for which the registered callback should
+    ///        be fired.
     void callCallback(int fd);
 
     /// Return the clock provided by this Gui.
@@ -510,6 +518,13 @@
         std::exit(EXIT_SUCCESS);
     }
 
+    /// Watch a file descriptor.
+    //
+    /// An implementing Gui should monitor the file descriptor in its main
+    /// loop. When the file descriptor is triggered, the implementation should
+    /// call callCallback().
+    ///
+    /// @param fd The file descriptor to be watched
     virtual bool watchFD(int /* fd */)
     {
         log_unimpl("This GUI does not implement FD watching.");

=== modified file 'plugin/plugin.cpp'
--- a/plugin/plugin.cpp 2010-03-18 23:33:50 +0000
+++ b/plugin/plugin.cpp 2010-03-19 00:27:58 +0000
@@ -55,7 +55,7 @@
 //  1: fatal errors (errors preventing the plugin from working as it should)
 //  2: informational messages
 //
-#define GNASH_PLUGIN_DEBUG 2
+#define GNASH_PLUGIN_DEBUG 1
 //#define WRITE_FILE
 
 #include "plugin.h"