[Gnash-commit] /srv/bzr/gnash/trunk r10210: Recommit strk's patch, because bazaar is too lame anything but the

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10210
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2008-10-30 22:41:07 +0100
message:
  Recommit strk's patch, because bazaar is too lame anything but the
  last commit.
modified:
  libsound/sdl/sound_handler_sdl.cpp
  libsound/sound_handler.h

=== modified file 'libsound/sdl/sound_handler_sdl.cpp'
--- a/libsound/sdl/sound_handler_sdl.cpp        2008-10-30 21:35:10 +0000
+++ b/libsound/sdl/sound_handler_sdl.cpp        2008-10-30 21:41:07 +0000
@@ -257,7 +257,7 @@
 
        // If this is called from a streamsoundblocktag, we only start if this
        // sound isn't already playing.
-       if (start_position > 0 && ! sounddata->_soundInstances.empty()) {
+       if (start_position && ! sounddata->_soundInstances.empty()) {
                return;
        }
 

=== modified file 'libsound/sound_handler.h'
--- a/libsound/sound_handler.h  2008-10-30 21:35:10 +0000
+++ b/libsound/sound_handler.h  2008-10-30 21:41:07 +0000
@@ -213,7 +213,10 @@
        ///
        /// @param start
        ///     When starting a soundstream from a random frame, this tells 
where in the
-       ///     data the decoding should start, in samples.
+       ///     data the decoding should start, in bytes.
+       ///     If non-zero, the sound will only start when no other instances 
of it
+       ///     are already playing.
+       ///     @todo use unsigned
        ///
        /// @param envelopes
        ///     Some eventsounds have some volume control mechanism called 
envelopes.