[Gnash-commit] gnash libmedia/ffmpeg/sound_handler_sdl.cpp Cha...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/27 15:32:30

Modified files:
        libmedia/ffmpeg: sound_handler_sdl.cpp 
        .              : ChangeLog 

Log message:
        Don't try to lock an already locked mutex. Fixes bug #23381.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6724&r2=1.6725

Patches:
Index: libmedia/ffmpeg/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libmedia/ffmpeg/sound_handler_sdl.cpp       26 May 2008 21:40:20 -0000      
1.10
+++ libmedia/ffmpeg/sound_handler_sdl.cpp       27 May 2008 15:32:29 -0000      
1.11
@@ -125,8 +125,12 @@
 
        for (size_t i=0, e=m_sound_data.size(); i < e; ++i)
        {
-               stop_sound(i);
-               delete_sound(i);
+               sound_data* sounddata = m_sound_data[i];
+
+               size_t nActiveSounds = sounddata->m_active_sounds.size();
+               soundsPlaying -= nActiveSounds;
+               _soundsStopped += nActiveSounds;
+               delete sounddata;
        }
        m_sound_data.clear();
 }

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6724
retrieving revision 1.6725
diff -u -b -r1.6724 -r1.6725
--- ChangeLog   27 May 2008 15:23:07 -0000      1.6724
+++ ChangeLog   27 May 2008 15:32:29 -0000      1.6725
@@ -1,3 +1,8 @@
+2008-05-27 Sandro Santilli <address@hidden>
+
+       * libmedia/ffmpeg/sound_handler_sdl.cpp (delete_all_sounds):
+         Don't try to lock an already locked mutex. Fixes bug #23381.
+
 2008-05-27 Benjamin Wolsey <address@hidden>
 
        * testsuite/swfdec/PASSING: update swfdec passes.