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

[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  e9cade9463fba67c994acd81ecace31c694c7b0d (commit)
      from  34ca16c955e36d6065d418ab850684edf2e3555e (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=e9cade9463fba67c994acd81ecace31c694c7b0d


commit e9cade9463fba67c994acd81ecace31c694c7b0d
Author: Sandro Santilli <address@hidden>
Date:   Thu Oct 21 19:43:10 2010 +0200

    Do not dereference a soundHandler if non-existing

diff --git a/gui/Player.cpp b/gui/Player.cpp
index d8539ec..e4314c1 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -184,16 +184,19 @@ Player::init_sound()
             log_error(_("Sound requested but no sound support compiled in"));
             return;
 #endif
+
+            if (! _audioDump.empty()) {
+                // TODO: move this logic into GUI
+                // add a silent stream to the audio pool so that our
+                // output file is homogenous;  we actually want silent
+                // wave data when no sounds are playing on the stage
+                _soundHandler->attach_aux_streamer(silentStream, (void*) this);
+            }
+
         } catch (SoundException& ex) {
             log_error(_("Could not create sound handler: %s."
                 " Will continue w/out sound."), ex.what());
         }
-        if (! _audioDump.empty()) {
-            // add a silent stream to the audio pool so that our output file
-            // is homogenous;  we actually want silent wave data when no sounds
-            // are playing on the stage
-            _soundHandler->attach_aux_streamer(silentStream, (void*) this);
-        }
     }
 }
 

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

Summary of changes:
 gui/Player.cpp |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash