[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_
From: |
Tomas Groth |
Subject: |
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2] |
Date: |
Mon, 30 Oct 2006 20:54:46 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Tomas Groth <tgc> 06/10/30 20:54:46
Modified files:
. : ChangeLog
backend : sound_handler_sdl.cpp
Log message:
Fixing start playing soundstreams for any frames when using libmad.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.16&r2=1.1412.2.17
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.29&r2=1.29.2.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.16
retrieving revision 1.1412.2.17
diff -u -b -r1.1412.2.16 -r1.1412.2.17
--- ChangeLog 30 Oct 2006 18:15:59 -0000 1.1412.2.16
+++ ChangeLog 30 Oct 2006 20:54:46 -0000 1.1412.2.17
@@ -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 Sandro Santilli <address@hidden>
* configure.ac: giveup if klash or kde gui is requested
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -b -r1.29 -r1.29.2.1
--- backend/sound_handler_sdl.cpp 21 Oct 2006 09:54:44 -0000 1.29
+++ backend/sound_handler_sdl.cpp 30 Oct 2006 20:54:46 -0000 1.29.2.1
@@ -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;
@@ -720,6 +718,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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2],
Tomas Groth <=