[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/sound_handler_s...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/26 21:40:20

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

Log message:
        add some missing lockings.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6711
retrieving revision 1.6712
diff -u -b -r1.6711 -r1.6712
--- ChangeLog   26 May 2008 20:30:51 -0000      1.6711
+++ ChangeLog   26 May 2008 21:40:20 -0000      1.6712
@@ -1,5 +1,6 @@
 2008-05-26 Sandro Santilli <address@hidden>
 
+       * libmedia/ffmpeg/sound_handler_sdl.cpp: add some missing lockings.
        * server/asobj/NetStreamFfmpeg.cpp (seek): seek time is given in
          second, not milliseconds...
        * libbase/FLVParser.cpp (seek): don't parse on seek, just don't

Index: libmedia/ffmpeg/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libmedia/ffmpeg/sound_handler_sdl.cpp       16 May 2008 13:57:18 -0000      
1.9
+++ libmedia/ffmpeg/sound_handler_sdl.cpp       26 May 2008 21:40:20 -0000      
1.10
@@ -120,6 +120,9 @@
 SDL_sound_handler::delete_all_sounds()
 {
        stop_all_sounds();
+
+       boost::mutex::scoped_lock lock(_mutex);
+
        for (size_t i=0, e=m_sound_data.size(); i < e; ++i)
        {
                stop_sound(i);
@@ -741,16 +744,16 @@
        // Get the soundhandler
        SDL_sound_handler* handler = static_cast<SDL_sound_handler*>(udata);
 
+       boost::mutex::scoped_lock lock(handler->_mutex);
+
        // If nothing to play there is no reason to play
        // Is this a potential deadlock problem?
-       if (handler->soundsPlaying == 0 && handler->m_aux_streamer.size() == 0) 
{
+       if (handler->soundsPlaying == 0 && handler->m_aux_streamer.empty()) {
             std::cout << "Pausing Audio now...\n";
                SDL_PauseAudio(1);
                return;
        }
 
-       boost::mutex::scoped_lock lock(handler->_mutex);
-
        // Mixed sounddata buffer
        Uint8* buffer = stream;
        memset(buffer, 0, buffer_length);