[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1805-g5ae7ec0

[Rob Savoye]

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  5ae7ec0ecd860bff59cf87dae5f05453e0bc1e29 (commit)
       via  bc65a35d1b4a5652ae1e0a9418a35093cdc9c527 (commit)
      from  e7fa6922ec2eee4b7e713c93784d3fd5d027b6b7 (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=5ae7ec0ecd860bff59cf87dae5f05453e0bc1e29


commit 5ae7ec0ecd860bff59cf87dae5f05453e0bc1e29
Merge: bc65a35 e7fa692
Author: Rob Savoye <address@hidden>
Date:   Sat Oct 26 13:49:04 2013 -0600

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
    
    Merge from upstream.


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


commit bc65a35d1b4a5652ae1e0a9418a35093cdc9c527
Author: Rob Savoye <address@hidden>
Date:   Sat Oct 26 13:48:45 2013 -0600

    reenable the delay factor

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 41153d8..98b9fb1 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -393,7 +393,7 @@ FBGui::run()
         delay = static_cast<int>(100000/fps);
     } else {
         // 10ms per heart beat
-        delay = 10000;
+        delay = 1000;
     }
     // log_debug(_("Movie Frame Rate is %d, adjusting delay to %dms"), fps,
     //           _interval * delay);
@@ -402,7 +402,7 @@ FBGui::run()
     while (!terminate_request) {  
         // wait the "heartbeat" inteval. _interval is in milliseconds,
         // but gnashSleep() wants nanoseconds, so adjust by 1000.
-        gnashSleep(_interval * 1000);
+        gnashSleep(_interval * delay);
         // TODO: Do we need to check the real time slept or is it OK when we 
woke
         // up early because of some Linux signal sent to our process (and thus
         // "advance" faster than the "heartbeat" interval)? - Udo

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

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


hooks/post-receive
-- 
Gnash