CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 08/01/21 18:57:28
Modified files:
. : ChangeLog
server/asobj : NetStream.cpp NetStreamGst.cpp
testsuite/actionscript.all: NetStream.as
Log message:
* server/asobj/NetStream.cpp: return undefined for currentFPS
if a
nonsensical number results.
* server/asobj/NetStreamGst.cpp: whitespace fixes.
* testsuite/actionscript.all/NetStream.as: revert my previous
change,
because the test accurately reflected PP behaviour, so we
should mimic
it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5449&r2=1.5450
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/NetStream.as?cvsroot=gnash&r1=1.17&r2=1.18
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5449
retrieving revision 1.5450
diff -u -b -r1.5449 -r1.5450
--- ChangeLog 21 Jan 2008 18:32:31 -0000 1.5449
+++ ChangeLog 21 Jan 2008 18:57:27 -0000 1.5450
@@ -1,3 +1,12 @@
+2008-01-21 Bastiaan Jacques <[EMAIL PROTECTED]>
+
+ * server/asobj/NetStream.cpp: return undefined for currentFPS if a
+ nonsensical number results.
+ * server/asobj/NetStreamGst.cpp: whitespace fixes.
+ * testsuite/actionscript.all/NetStream.as: revert my previous change,
+ because the test accurately reflected PP behaviour, so we should mimic
+ it.
+
2008-01-21 Sandro Santilli <[EMAIL PROTECTED]>
* testsuite/misc-ming.all/masks_testrunner.cpp: add tests for effect
Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/asobj/NetStream.cpp 21 Jan 2008 07:07:27 -0000 1.79
+++ server/asobj/NetStream.cpp 21 Jan 2008 18:57:28 -0000 1.80
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStream.cpp,v 1.79 2008/01/21 07:07:27 bjacques Exp $ */
+/* $Id: NetStream.cpp,v 1.80 2008/01/21 18:57:28 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -312,6 +312,12 @@
{
boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
+ double fps = ns->getCurrentFPS();
+
+ if (fps <= 0) {
+ return as_value(); // undef
+ }
+
return as_value(ns->getCurrentFPS());
}
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
Index: testsuite/actionscript.all/NetStream.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/NetStream.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/NetStream.as 21 Jan 2008 18:16:16 -0000
1.17
+++ testsuite/actionscript.all/NetStream.as 21 Jan 2008 18:57:28 -0000
1.18
@@ -20,7 +20,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: NetStream.as,v 1.17 2008/01/21 18:16:16 bjacques Exp $";
+rcsid="$Id: NetStream.as,v 1.18 2008/01/21 18:57:28 bjacques Exp $";
#include "check.as"
@@ -150,7 +150,7 @@
/* Properties */
// currentFps (read-only)
-check_equals ( typeof(netstreamObj.currentFps), 'number' );
+check_equals ( typeof(netstreamObj.currentFps), 'undefined' );
netstreamObj.currentFps = 'string';
xcheck_equals ( typeof(netstreamObj.currentFps), 'string' );
netstreamObj.currentFps = false;
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
