CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/11/23 15:14:35
Modified files:
. : ChangeLog
testsuite/misc-ming.all: NetStream-SquareTest.c
server/asobj : NetStream.cpp
Log message:
Correctly case NetStream.currentFps member, test that currentFps (and
who
knows what else) is only available after construction of an object
(possibly
only if the object is constructed with a valid NetConnection arg).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4940&r2=1.4941
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-SquareTest.c?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.75&r2=1.76
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4940
retrieving revision 1.4941
diff -u -b -r1.4940 -r1.4941
--- ChangeLog 23 Nov 2007 14:20:28 -0000 1.4940
+++ ChangeLog 23 Nov 2007 15:14:34 -0000 1.4941
@@ -1,5 +1,9 @@
2007-11-23 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/asobj/NetStream.cpp: correctly case currentFps member.
+ * testsuite/misc-ming.all/NetStream-SquareTest.c: add test for
+ currentFps only being defined on NetStream.prototype after
+ construction of a NetStream instance.
* server/asobj/ClassHierarchy.cpp: make NetStream available
also in version 6.
Index: testsuite/misc-ming.all/NetStream-SquareTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/NetStream-SquareTest.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/misc-ming.all/NetStream-SquareTest.c 1 Jul 2007 10:54:46
-0000 1.14
+++ testsuite/misc-ming.all/NetStream-SquareTest.c 23 Nov 2007 15:14:35
-0000 1.15
@@ -77,7 +77,10 @@
sprintf(buffer,
"nc=new NetConnection();"
"nc.connect(null);"
+ "check(!NetStream.prototype.hasOwnProperty('currentFPS'));" // version
7 here
+ "xcheck(!NetStream.prototype.hasOwnProperty('currentFps'));"
"stream = new NetStream(nc);"
+ "check(NetStream.prototype.hasOwnProperty('currentFps'));"
"video.attachVideo(stream); "
"stream.setBufferTime(2); "
"stream.play('%s');"
Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/asobj/NetStream.cpp 20 Nov 2007 00:44:04 -0000 1.75
+++ server/asobj/NetStream.cpp 23 Nov 2007 15:14:35 -0000 1.76
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStream.cpp,v 1.75 2007/11/20 00:44:04 cmusick Exp $ */
+/* $Id: NetStream.cpp,v 1.76 2007/11/23 15:14:35 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -403,7 +403,7 @@
o.init_readonly_property("bytesTotal", *gettersetter);
gettersetter = new builtin_function(&netstream_currentFPS, NULL);
- o.init_readonly_property("currentFPS", *gettersetter);
+ o.init_readonly_property("currentFps", *gettersetter);
gettersetter = new builtin_function(&netstream_bufferLength, NULL);
o.init_readonly_property("bufferLength", *gettersetter);
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
