[Gnash-commit] [SCM] Gnash branch, master, updated. 47a20a77980ca65fe3dccab1565d346b3eae8569

[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  47a20a77980ca65fe3dccab1565d346b3eae8569 (commit)
       via  b16a5f7b4e418cd01b623e28963d1784acff60c8 (commit)
       via  d5d5fb6f2a0a0b9411bcb115da66ed03d144fb9a (commit)
      from  8a5fc4d997179ffd9aa0724ec1903c84eecee9fe (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=47a20a77980ca65fe3dccab1565d346b3eae8569


commit 47a20a77980ca65fe3dccab1565d346b3eae8569
Author: Sandro Santilli <address@hidden>
Date:   Fri Oct 22 20:05:24 2010 +0200

    Fix build of pythonview (bug #31417)

diff --git a/gui/pythonmod/gnash-view.cpp b/gui/pythonmod/gnash-view.cpp
index f20fc48..633e0ef 100644
--- a/gui/pythonmod/gnash-view.cpp
+++ b/gui/pythonmod/gnash-view.cpp
@@ -217,7 +217,7 @@ gnash_view_init(GnashView *view)
 #ifdef SOUND_SDL
     try {
         view->sound_handler.reset(gnash::sound::create_sound_handler_sdl(
-                view->media_handler.get(), ""));
+                view->media_handler.get()));
     } catch (gnash::SoundException& ex) {
         gnash::log_error(_("Could not create sound handler: %s."
                            " Will continue w/out sound."), ex.what());

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


commit b16a5f7b4e418cd01b623e28963d1784acff60c8
Author: Sandro Santilli <address@hidden>
Date:   Fri Oct 22 18:23:29 2010 +0200

    fix description of RunResources member

diff --git a/gui/gui.h b/gui/gui.h
index 128aeef..41ee9d5 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -506,7 +506,7 @@ protected:
     /// Desired window height.
     int _height;
 
-    /// Desired colour depth in bits.
+    /// Per-run resources
     RunResources& _runResources;
 
     /// Main loop interval: the time between successive advance_movie calls.

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


commit d5d5fb6f2a0a0b9411bcb115da66ed03d144fb9a
Author: Sandro Santilli <address@hidden>
Date:   Fri Oct 22 18:14:16 2010 +0200

    Player notifies audioDump to gui, gui tells sound_handler at ::start (right 
before virtualclock is resumed)

diff --git a/gui/Player.cpp b/gui/Player.cpp
index c1d87b4..b9eb163 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -177,11 +177,6 @@ Player::init_sound()
             return;
 #endif
 
-            if (! _audioDump.empty()) {
-                // TODO: notify tu Gui instead
-                _soundHandler->setAudioDump(_audioDump);
-            }
-
         } catch (SoundException& ex) {
             log_error(_("Could not create sound handler: %s."
                 " Will continue w/out sound."), ex.what());
@@ -198,6 +193,7 @@ Player::init_gui()
         _gui.reset(new NullGui(_doLoop, *_runResources));
     }
 
+    _gui->setAudioDump(_audioDump);
     _gui->setMaxAdvances(_maxAdvances);
 
 #ifdef GNASH_FPS_DEBUG
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 75f556d..1c41796 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -912,14 +912,20 @@ Gui::start()
     bool background = true; // ??
     _stage->set_background_alpha(background ? 1.0f : 0.05f);
 
+    // to properly update stageMatrix if scaling is given  
+    resize_view(_width, _height); 
+
     // @todo since we registered the sound handler, shouldn't we know
     //       already what it is ?!
     sound::sound_handler* s = _stage->runResources().soundHandler();
-    if ( s ) s->unpause();
+    if ( s ) {
+        if ( ! _audioDump.empty() ) {
+            s->setAudioDump(_audioDump);
+        }
+        s->unpause();
+    }
     _started = true;
     
-    // to properly update stageMatrix if scaling is given  
-    resize_view(_width, _height); 
 
     log_debug("Starting virtual clock");
     _virtualClock.resume();

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

Summary of changes:
 gui/Player.cpp               |    6 +-----
 gui/gui.cpp                  |   12 +++++++++---
 gui/gui.h                    |    2 +-
 gui/pythonmod/gnash-view.cpp |    2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash