CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/09/05 13:05:15
Modified files:
. : ChangeLog
backend : sound_handler_gst.cpp sound_handler_sdl.cpp
Log message:
* backend/sound_handler_{sdl,gst}.cpp: Remove primitive
audio syncing code. Fixes bug #20866 and #20851, but reopens
#20681.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4229&r2=1.4230
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.83&r2=1.84
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4229
retrieving revision 1.4230
diff -u -b -r1.4229 -r1.4230
--- ChangeLog 5 Sep 2007 09:47:55 -0000 1.4229
+++ ChangeLog 5 Sep 2007 13:05:14 -0000 1.4230
@@ -1,3 +1,9 @@
+2007-09-05 Tomas Groth Christensen <[EMAIL PROTECTED]>
+
+ * backend/sound_handler_{sdl,gst}.cpp: Remove primitive
+ audio syncing code. Fixes bug #20866 and #20851, but reopens
+ #20681.
+
2007-09-05 Sandro Santilli <[EMAIL PROTECTED]>
* server/dlist.{cpp,h}: add ::unload method for taking
Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- backend/sound_handler_gst.cpp 10 Aug 2007 10:24:11 -0000 1.60
+++ backend/sound_handler_gst.cpp 5 Sep 2007 13:05:15 -0000 1.61
@@ -20,7 +20,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_gst.cpp,v 1.60 2007/08/10 10:24:11 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.61 2007/09/05 13:05:15 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -270,13 +270,8 @@
sound_data* sounddata = m_sound_data[sound_handle];
// If this is called from a streamsoundblocktag, we only start if this
- // sound isn't already playing. If a active_sound-struct is existing we
- // assume it is also playing. If necessary we do some sync'ing
+ // sound isn't already playing.
if (start_position > 0 && sounddata->m_gst_elements.size() > 0) {
- // This is the ugly sync'ing. If the renderer-sync'ing to the
timeline
- // works, this should only be needed when we're
position-jumping in streams.
- int diff = abs(sounddata->m_gst_elements[0]->position -
start_position);
- if (diff > 2000) sounddata->m_gst_elements[0]->position =
start_position;
return;
}
// Make sure sound actually got some data
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- backend/sound_handler_sdl.cpp 5 Sep 2007 01:41:25 -0000 1.83
+++ backend/sound_handler_sdl.cpp 5 Sep 2007 13:05:15 -0000 1.84
@@ -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.83 2007/09/05 01:41:25 nihilus Exp $
+// $Id: sound_handler_sdl.cpp,v 1.84 2007/09/05 13:05:15 tgc Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -238,13 +238,8 @@
sound_data* sounddata = m_sound_data[sound_handle];
// If this is called from a streamsoundblocktag, we only start if this
- // sound isn't already playing. If a active_sound-struct is existing we
- // assume it is also playing. If necessary we do some sync'ing
+ // sound isn't already playing.
if (start_position > 0 && sounddata->m_active_sounds.size() > 0) {
- // This is the ugly sync'ing. If the renderer-sync'ing to the
timeline
- // works, this should only be needed when we're
position-jumping in streams.
- int diff = abs(sounddata->m_active_sounds[0]->position -
start_position);
- if (diff > 2000) sounddata->m_active_sounds[0]->position =
start_position;
return;
}
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
