CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/05/06 13:35:37
Modified files:
. : ChangeLog
server : sprite_instance.cpp
server/asobj : NetStreamFfmpeg.cpp NetStreamFfmpeg.h
Log message:
* server/sprite_instance.cpp: Stop all sounds when restarting
a movie, fixes bug #19568.
* server/asobj/NetStreamFfmpeg.cpp: Fixed return time.
* server/asobj/NetStreamFfmpeg.h: Added a comment.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3109&r2=1.3110
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.263&r2=1.264
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.24&r2=1.25
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3109
retrieving revision 1.3110
diff -u -b -r1.3109 -r1.3110
--- ChangeLog 5 May 2007 18:00:35 -0000 1.3109
+++ ChangeLog 6 May 2007 13:35:36 -0000 1.3110
@@ -1,3 +1,10 @@
+2007-05-06 Tomas Groth Christensen <[EMAIL PROTECTED]>
+
+ * server/sprite_instance.cpp: Stop all sounds when restarting
+ a movie, fixes bug #19568.
+ * server/asobj/NetStreamFfmpeg.cpp: Fixed return time.
+ * server/asobj/NetStreamFfmpeg.h: Added a comment.
+
2007-05-04 Sandro Santilli <[EMAIL PROTECTED]>
* testsuite/samples/clip_as_button2-TestRunner.cpp: add pixel
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -b -r1.263 -r1.264
--- server/sprite_instance.cpp 3 May 2007 18:10:45 -0000 1.263
+++ server/sprite_instance.cpp 6 May 2007 13:35:37 -0000 1.264
@@ -3151,6 +3151,10 @@
m_has_looped = false;
m_play_state = PLAY;
+ // Stop all sounds
+ sound_handler* sh = get_sound_handler();
+ if (sh != NULL) sh->stop_all_sounds();
+
// We're about to reset the displayList,
// so take note of the current bounds
// for the renderer to know what to
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/asobj/NetStreamFfmpeg.cpp 5 May 2007 13:31:44 -0000 1.46
+++ server/asobj/NetStreamFfmpeg.cpp 6 May 2007 13:35:37 -0000 1.47
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.46 2007/05/05 13:31:44 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.47 2007/05/06 13:35:37 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1053,7 +1053,7 @@
double time = (double)m_FormatCtx->streams[0]->time_base.num /
(double)m_FormatCtx->streams[0]->time_base.den *
(double)m_FormatCtx->streams[0]->cur_dts;
return static_cast<int64_t>(time);
} else if (m_isFLV) {
- return static_cast<int64_t>(m_video_clock / 1000);
+ return static_cast<int64_t>(m_video_clock);
} else {
return 0;
}
Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/NetStreamFfmpeg.h 5 May 2007 13:31:44 -0000 1.24
+++ server/asobj/NetStreamFfmpeg.h 6 May 2007 13:35:37 -0000 1.25
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: NetStreamFfmpeg.h,v 1.24 2007/05/05 13:31:44 strk Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.25 2007/05/06 13:35:37 tgc Exp $ */
#ifndef __NETSTREAMFFMPEG_H__
#define __NETSTREAMFFMPEG_H__
@@ -101,10 +101,11 @@
{
bool rc = false;
boost::mutex::scoped_lock lock(_mutex);
- // So.. if there are 20 items in the queue...
- // disregard the next item? WTF?
- if (m_queue.size() < 20) // hack
+ // We only keep max 20 items in the queue.
+ // If it's "full" the item must wait, see calls
+ // to this function in read_frame() to see how it is
done.
+ if (m_queue.size() < 20)
{
m_queue.push(member);
rc = true;
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
