[Gnash-commit] /srv/bzr/gnash/trunk r11383: Don't delete sounds when restarting a SWF. Fixes bug #27132.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11383 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2009-08-07 09:43:18 +0200
message:
  Don't delete sounds when restarting a SWF. Fixes bug #27132.
modified:
  libsound/sdl/sound_handler_sdl.cpp
  libsound/sound_handler.cpp

=== modified file 'libsound/sdl/sound_handler_sdl.cpp'
--- a/libsound/sdl/sound_handler_sdl.cpp        2009-06-12 20:50:23 +0000
+++ b/libsound/sdl/sound_handler_sdl.cpp        2009-08-07 07:11:40 +0000
@@ -160,7 +160,6 @@
 SDL_sound_handler::reset()
 {
     boost::mutex::scoped_lock lock(_mutex);
-    sound_handler::delete_all_sounds();
     sound_handler::stop_all_sounds();
 }
 

=== modified file 'libsound/sound_handler.cpp'
--- a/libsound/sound_handler.cpp        2009-06-10 11:27:47 +0000
+++ b/libsound/sound_handler.cpp        2009-08-07 07:11:40 +0000
@@ -689,7 +689,8 @@
 void
 sound_handler::reset()
 {
-    sound_handler::delete_all_sounds();
+    // Do not delete sounds on reset or there'd be nothing to play
+    // on restart. For a new SWF, we need a new sound_handler.
     sound_handler::stop_all_sounds();
 }