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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       06/10/30 22:40:51

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_sdl.cpp 

Log message:
        Fixed starting soundstreams from any frame when using libmad.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1449&r2=1.1450
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1449
retrieving revision 1.1450
diff -u -b -r1.1449 -r1.1450
--- ChangeLog   30 Oct 2006 20:33:48 -0000      1.1449
+++ ChangeLog   30 Oct 2006 22:40:50 -0000      1.1450
@@ -1,3 +1,8 @@
+2006-10-30 Tomas Groth Christensen <address@hidden>
+
+       * backend/sound_handler_sdl.cpp: Fixed starting soundstreams
+         from any frame when using libmad.
+
 2006-10-30 Udo Giacomozzi <address@hidden>
 
        * testsuite/samples/: subshapes.swf, README:

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- backend/sound_handler_sdl.cpp       29 Oct 2006 17:14:59 -0000      1.30
+++ backend/sound_handler_sdl.cpp       30 Oct 2006 22:40:51 -0000      1.31
@@ -232,14 +232,12 @@
        }
 
        pthread_mutex_unlock(&mutex);
-       return start_size;
-
 
+       return start_size;
 }
 
 
 void   SDL_sound_handler::play_sound(int sound_handle, int loop_count, int 
offset, long start_position, std::vector<sound_envelope>* envelopes)
-//uint8_t env_count, uint32_t* envelopes)
 // Play the index'd sample.
 {
        pthread_mutex_lock(&mutex);
@@ -307,7 +305,7 @@
                mad_stream_init(&sound->stream);
                mad_frame_init(&sound->frame);
                mad_synth_init(&sound->synth);
-               mad_stream_buffer(&sound->stream, sound->data, 
sound->data_size);
+               mad_stream_buffer(&sound->stream, sound->data+sound->position, 
sound->data_size-sound->position);
 
                sound->raw_data = 0;
                sound->raw_data_size = 0;
@@ -760,6 +758,7 @@
                                sound->position += bytes_decoded;
 
 #elif defined(USE_MAD)
+
                                // If we need to loop, we reset the data 
pointer, and tell mad about it
                                if (sound->data_size == sound->position && 
sound->loop_count != 0) {
                                        sound->position = 0;