[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/08/14 09:29:12

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_sdl.cpp 

Log message:
                * backend/sound_handler_sdl.cpp: Also count sounds who stops
                  because the reached the end. Fixes random eventSoundTest1
                  failures.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4005&r2=1.4006
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.81&r2=1.82

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4005
retrieving revision 1.4006
diff -u -b -r1.4005 -r1.4006
--- ChangeLog   14 Aug 2007 06:07:02 -0000      1.4005
+++ ChangeLog   14 Aug 2007 09:29:11 -0000      1.4006
@@ -1,3 +1,9 @@
+2007-08-14 Tomas Groth Christensen <address@hidden>
+
+       * backend/sound_handler_sdl.cpp: Also count sounds who stops
+         because the reached the end. Fixes random eventSoundTest1
+         failures.
+
 2007-08-14 Ivor Blockley <address@hidden>
 
        * server/array.cpp: replace VLAs with std containers.

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- backend/sound_handler_sdl.cpp       11 Aug 2007 05:25:04 -0000      1.81
+++ backend/sound_handler_sdl.cpp       14 Aug 2007 09:29:12 -0000      1.82
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.81 2007/08/11 05:25:04 strk Exp $
+// $Id: sound_handler_sdl.cpp,v 1.82 2007/08/14 09:29:12 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1028,15 +1028,18 @@
                                sound->delete_raw_data();
                                
sounddata->m_active_sounds.erase(sounddata->m_active_sounds.begin() + j);
                                handler->soundsPlaying--;
+                               handler->_soundsStopped++;
 
 
                        // Sound is done, remove it from the active list 
(adpcm/native16)
                        } else if (sound->loop_count == 0 && soundFormat == 
FORMAT_NATIVE16 && sound->raw_position >= sound->raw_data_size && 
sound->raw_data_size != 0) {
                                
sounddata->m_active_sounds.erase(sounddata->m_active_sounds.begin() + j);
                                handler->soundsPlaying--;
+                               handler->_soundsStopped++;
                        } else if (sound->raw_position == 0 && 
sound->raw_data_size == 0) {
                                
sounddata->m_active_sounds.erase(sounddata->m_active_sounds.begin() + j);
                                handler->soundsPlaying--;
+                               handler->_soundsStopped++;
                        }
 
                } // active sounds loop