[Gnash-commit] [SCM] Gnash branch, master, updated. 2e20bb92dacdfdb0ecbaffd8ce43ea9ce1a7de0d

[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  2e20bb92dacdfdb0ecbaffd8ce43ea9ce1a7de0d (commit)
       via  e782a900dc57c56d1c45a45f0d7806660001a660 (commit)
      from  1bcd7fa18316dbe553eb6f01183fdc850622c2c1 (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=2e20bb92dacdfdb0ecbaffd8ce43ea9ce1a7de0d


commit 2e20bb92dacdfdb0ecbaffd8ce43ea9ce1a7de0d
Merge: e782a90 1bcd7fa
Author: Sandro Santilli <address@hidden>
Date:   Mon Oct 25 15:21:04 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


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


commit e782a900dc57c56d1c45a45f0d7806660001a660
Author: Sandro Santilli <address@hidden>
Date:   Mon Oct 25 15:20:36 2010 +0200

    Allow GUIs to provide a custom clock. Have DUMP gui use a ManualClock

diff --git a/gui/dump.cpp b/gui/dump.cpp
index dea45c2..42bd2d1 100644
--- a/gui/dump.cpp
+++ b/gui/dump.cpp
@@ -163,6 +163,8 @@ DumpGui::run()
     _terminate_request = false;
     while (!_terminate_request) {
 
+       _manualClock.advance(_interval); 
+
         // advance movie now
         if ( advanceMovie() ) {
             ++_framecount;
diff --git a/gui/dump.h b/gui/dump.h
index 27a21f2..23e1bc2 100644
--- a/gui/dump.h
+++ b/gui/dump.h
@@ -26,6 +26,7 @@
 #include "dsodefs.h" // for DSOEXPORT
 #include "gui.h" // for inheritance
 #include "sound_handler.h" // for dtor visibility
+#include "ManualClock.h"
 
 #include <string>
 #include <fstream>
@@ -71,6 +72,7 @@ class DSOEXPORT DumpGui : public Gui
     bool want_redraw() { return false; }
     void writeFrame();
     void writeSamples();
+    VirtualClock& getClock() { return _manualClock; }
 
 private:
     
@@ -97,6 +99,7 @@ private:
 
     boost::shared_ptr<sound::sound_handler> _soundHandler;
 
+    ManualClock _manualClock;
 
 
 };
diff --git a/gui/gui.h b/gui/gui.h
index 41ee9d5..3a11dcc 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -119,7 +119,7 @@ public:
     /// The Gui clock will be paused when the gui is put
     /// in pause mode and resumed when gui playback is resumed.
     ///
-    VirtualClock& getClock() { return _virtualClock; }
+    virtual VirtualClock& getClock() { return _virtualClock; }
 
     /// Set the time in milliseconds after which the programme should exit.
     virtual void setTimeout(unsigned int timeout) = 0;

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

Summary of changes:
 gui/dump.cpp |    2 ++
 gui/dump.h   |    3 +++
 gui/gui.h    |    2 +-
 3 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash