[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-459-g42f2978

[Benjamin Wolsey]

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  42f2978e5dae75c52c902fe955a0bbad32dfb61e (commit)
       via  1416252650d72749a6251e348cdc8dbea6ab332f (commit)
      from  9fce1c962efeab81ebaa52ab4662b3e249dfebf8 (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=42f2978e5dae75c52c902fe955a0bbad32dfb61e


commit 42f2978e5dae75c52c902fe955a0bbad32dfb61e
Author: Benjamin Wolsey <address@hidden>
Date:   Sat Jul 9 12:56:27 2011 +0200

    Don't add sounds if there's no decoder available!

diff --git a/libsound/LiveSound.cpp b/libsound/LiveSound.cpp
index bca4f2b..5ca7234 100644
--- a/libsound/LiveSound.cpp
+++ b/libsound/LiveSound.cpp
@@ -47,12 +47,7 @@ LiveSound::createDecoder(media::MediaHandler& mh, const 
media::SoundInfo& si)
     media::AudioInfo info(si.getFormat(), si.getSampleRate(), 
         si.is16bit() ? 2 : 1, si.isStereo(), 0, media::CODEC_TYPE_FLASH);
 
-    try {
-        _decoder.reset(mh.createAudioDecoder(info).release());
-    }
-    catch (const MediaException& e) {
-        log_error("AudioDecoder initialization failed: %s", e.what());
-    }
+    _decoder.reset(mh.createAudioDecoder(info).release());
 }
 
 unsigned int 
diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index 413d5e3..aada9ea 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -429,9 +429,14 @@ sound_handler::playStream(int soundId, StreamBlockId 
blockId)
     StreamingSoundData& s = *_streamingSounds[soundId];
     if (s.isPlaying() || s.empty()) return;
 
-    std::auto_ptr<InputStream> is(s.createInstance(*_mediaHandler, blockId));
-
-    plugInputStream(is);
+    try {
+        std::auto_ptr<InputStream> is(
+                s.createInstance(*_mediaHandler, blockId));
+        plugInputStream(is);
+    }
+    catch (const MediaException& e) {
+        log_error("Could not start streaming sound: %s", e.what());
+    }
 }
 
 /*public*/
@@ -514,12 +519,18 @@ sound_handler::startSound(int handle, int loops, const 
SoundEnvelopes* env,
         return;
     }
 
-    // Make an InputStream for this sound and plug it into  
-    // the set of InputStream channels
-    std::auto_ptr<InputStream> sound(sounddata.createInstance(*_mediaHandler,
-            inPoint, outPoint, env, loops));
+    try {
+        // Make an InputStream for this sound and plug it into  
+        // the set of InputStream channels
+        std::auto_ptr<InputStream> sound(
+                sounddata.createInstance(*_mediaHandler, inPoint, outPoint,
+                    env, loops));
+        plugInputStream(sound);
+    }
+    catch (const MediaException& e) {
+        log_error("Could not start event sound: %s", e.what());
+    }
 
-    plugInputStream(sound);
 }
 
 void

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


commit 1416252650d72749a6251e348cdc8dbea6ab332f
Author: Benjamin Wolsey <address@hidden>
Date:   Sat Jul 9 11:51:04 2011 +0200

    Drop old irritating debugging message.

diff --git a/libcore/Button.cpp b/libcore/Button.cpp
index 4bd4464..a7303ed 100644
--- a/libcore/Button.cpp
+++ b/libcore/Button.cpp
@@ -465,8 +465,6 @@ Button::mouseEvent(const event_id& event)
 {
     if (unloaded()) {
         // We don't respond to events while unloaded. See bug #22982.
-        log_debug("Button %s received %s button event while unloaded: ignored",
-            getTarget(), event);
         return;
     }
 

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

Summary of changes:
 libcore/Button.cpp         |    2 --
 libsound/LiveSound.cpp     |    7 +------
 libsound/sound_handler.cpp |   27 +++++++++++++++++++--------
 3 files changed, 20 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
Gnash