[Gnash-commit] [SCM] Gnash branch, master, updated. d2399ea06a3d65015d9534e8d0a9ca392483c373

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  d2399ea06a3d65015d9534e8d0a9ca392483c373 (commit)
       via  6daf9a3ea8732975f9dd710d9355c6b86888e011 (commit)
       via  ed95d1d56222dcb41cbbc0b3b4e8d6848fabf261 (commit)
      from  4597712d5db0186d9ffb431f108f284fd15ad7bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=d2399ea06a3d65015d9534e8d0a9ca392483c373


commit d2399ea06a3d65015d9534e8d0a9ca392483c373
Author: Sandro Santilli <address@hidden>
Date:   Thu Nov 11 20:56:37 2010 +0100

    Drop DEBUG_SHOW_FPS blocks, as that's handled by base Gui already

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index ffe045a..7bf1639 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -113,13 +113,6 @@
 
 #include <linux/input.h>    // for /dev/input/event*
 
-//#define DEBUG_SHOW_FPS  // prints number of frames per second to STDOUT
-
-#ifdef DEBUG_SHOW_FPS
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-#endif
 
 // workaround until fatal_error() is implemented
 // that is not silent without -v switch
@@ -144,35 +137,6 @@ namespace gnash
 
 
 //---------------
-#ifdef DEBUG_SHOW_FPS
-double fps_timer=0;
-int fps_counter=0;
-void
-profile()
-{
-    int fd;
-    double uptime, idletime;
-    char buffer[20];
-    int readcount;
-    
-    fd = open("/proc/uptime", O_RDONLY);
-    if (fd<0) return;
-    readcount = read(fd, buffer, sizeof(buffer)-1);
-    buffer[readcount]=0;
-    sscanf(buffer, "%lf %lf", &uptime, &idletime);
-    close(fd);
-    
-    fps_counter++;
-    
-    if (fps_counter<2) {
-        fps_timer = uptime;
-        return;    
-    }
-    
-    printf("FPS: %.3f (%.2f)\n", fps_counter/(uptime-fps_timer), 
uptime-fps_timer);
-    
-}
-#endif
 
 int terminate_request = false;  // global scope to avoid GUI access
 
@@ -471,9 +435,6 @@ FBGui::renderBuffer()
        
 #endif
   
-#ifdef DEBUG_SHOW_FPS
-    profile();
-#endif
 }
 
 bool

http://git.savannah.gnu.org/cgit//commit/?id=6daf9a3ea8732975f9dd710d9355c6b86888e011


commit 6daf9a3ea8732975f9dd710d9355c6b86888e011
Author: Sandro Santilli <address@hidden>
Date:   Thu Nov 11 20:47:53 2010 +0100

    comment out more GNASH_REPORT_FUNCTION

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 897221b..ffe045a 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -263,7 +263,7 @@ FBGui::set_grayscale_lut8()
 bool
 FBGui::init(int argc, char *** argv)
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
 
     // Initialize all the input devices
 
@@ -341,7 +341,7 @@ FBGui::init(int argc, char *** argv)
 bool
 FBGui::initialize_renderer()
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
 
     const int bpp = var_screeninfo.bits_per_pixel;
     const int size = fix_screeninfo.smem_len; 
@@ -402,7 +402,7 @@ FBGui::initialize_renderer()
 bool
 FBGui::run()
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
   
 #ifdef USE_TSLIB
     int ts_loop_count;
@@ -443,7 +443,7 @@ FBGui::run()
 void
 FBGui::renderBuffer()
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
 
     if ( _drawbounds.size() == 0 ) return; // nothing to do..
 

http://git.savannah.gnu.org/cgit//commit/?id=ed95d1d56222dcb41cbbc0b3b4e8d6848fabf261


commit ed95d1d56222dcb41cbbc0b3b4e8d6848fabf261
Author: Sandro Santilli <address@hidden>
Date:   Thu Nov 11 20:46:14 2010 +0100

    spacing

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 8433a2a..897221b 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -464,7 +464,7 @@ FBGui::renderBuffer()
         const int maxy = bounds.getMaxY();
     
         for (int y=bounds.getMinY(); y<=maxy; ++y) {
-            const unsigned int pixel_index = y * m_rowsize + minx*pixel_size;  
    
+            const unsigned int pixel_index = y*m_rowsize + minx*pixel_size;
             memcpy(&fbmem[pixel_index], &buffer[pixel_index], row_size);
         }
     }  

-----------------------------------------------------------------------

Summary of changes:
 gui/fb/fb.cpp |   49 +++++--------------------------------------------
 1 files changed, 5 insertions(+), 44 deletions(-)


hooks/post-receive
-- 
Gnash