[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/extension.cpp libbase/s...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog libbase/extension.cpp libbase/s... |
|
Date: |
Wed, 10 Jan 2007 00:09:56 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/01/10 00:09:56
Modified files:
. : ChangeLog
libbase : extension.cpp sharedlib.cpp
server/asobj : Global.cpp
testsuite/actionscript.all: Camera.as LocalConnection.as
NetConnection.as NetStream.as
System.as
Log message:
* libbase/: extension.cpp, sharedlib.cpp: hush compiler warnings
about unused parameters.
* server/asobj/Global.cpp (ctor): stubbed organization of
ActionScript classes in SWF target versions (volunteers
to filling it up?).
* testsuite/actionscript.all/: LocalConnection.as, Camera.as,
NetStream.as, System.as, NetConnection:
test that the class are unavailable when target version
is < their entry point.
* testsuite/actionscript.all/Video.as: xcheck => check
(not available when swfversion<6)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2069&r2=1.2070
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Camera.as?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/LocalConnection.as?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/NetConnection.as?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/NetStream.as?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/System.as?cvsroot=gnash&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2069
retrieving revision 1.2070
diff -u -b -r1.2069 -r1.2070
--- ChangeLog 9 Jan 2007 23:30:36 -0000 1.2069
+++ ChangeLog 10 Jan 2007 00:09:56 -0000 1.2070
@@ -1,5 +1,19 @@
2007-01-10 Sandro Santilli <address@hidden>
+ * libbase/: extension.cpp, sharedlib.cpp: hush compiler warnings
+ about unused parameters.
+ * server/asobj/Global.cpp (ctor): stubbed organization of
+ ActionScript classes in SWF target versions (volunteers
+ to filling it up?).
+ * testsuite/actionscript.all/: LocalConnection.as, Camera.as,
+ NetStream.as, System.as, NetConnection:
+ test that the class are unavailable when target version
+ is < their entry point.
+ * testsuite/actionscript.all/Video.as: xcheck => check
+ (not available when swfversion<6)
+
+2007-01-10 Sandro Santilli <address@hidden>
+
* backend/render_handler_tri.cpp, server/array.cpp,
server/sprite_instance.cpp, server/text.cpp,
server/swf/tag_loaders.cpp: House cleaning
Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/extension.cpp 17 Dec 2006 21:41:52 -0000 1.6
+++ libbase/extension.cpp 10 Jan 2007 00:09:56 -0000 1.7
@@ -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: extension.cpp,v 1.6 2006/12/17 21:41:52 rsavoye Exp $ */
+/* $Id: extension.cpp,v 1.7 2007/01/10 00:09:56 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -175,7 +175,7 @@
int i;
struct dirent *entry;
- string::size_type pos;
+ //string::size_type pos;
char *dirlistcopy;
char *dir;
Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libbase/sharedlib.cpp 17 Dec 2006 21:41:52 -0000 1.13
+++ libbase/sharedlib.cpp 10 Jan 2007 00:09:56 -0000 1.14
@@ -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: sharedlib.cpp,v 1.13 2006/12/17 21:41:52 rsavoye Exp $ */
+/* $Id: sharedlib.cpp,v 1.14 2007/01/10 00:09:56 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -57,18 +57,18 @@
namespace gnash {
#ifdef LT_DLMUTEX
-static void
-gnash_mutex_seterror (void)
-{
- GNASH_REPORT_FUNCTION;
-}
-
-static const char *
-gnash_mutex_geterror (void)
-{
- GNASH_REPORT_FUNCTION;
- return NULL;
-}
+//static void
+//gnash_mutex_seterror (void)
+//{
+// GNASH_REPORT_FUNCTION;
+//}
+//
+//static const char *
+//gnash_mutex_geterror (void)
+//{
+// GNASH_REPORT_FUNCTION;
+// return NULL;
+//}
void
gnash_mutex_lock (void)
Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/Global.cpp 9 Jan 2007 15:14:20 -0000 1.27
+++ server/asobj/Global.cpp 10 Jan 2007 00:09:56 -0000 1.28
@@ -18,7 +18,7 @@
// Implementation of the Global ActionScript Object
-/* $Id: Global.cpp,v 1.27 2007/01/09 15:14:20 rsavoye Exp $ */
+/* $Id: Global.cpp,v 1.28 2007/01/10 00:09:56 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -59,9 +59,10 @@
#include "TextSnapshot.h"
#include "Video.h"
#include "extension.h"
+#include "VM.h"
-#include <fn_call.h>
-#include <sprite_instance.h>
+#include "fn_call.h"
+#include "sprite_instance.h"
#include "xml.h"
#include "xmlsocket.h"
@@ -402,21 +403,12 @@
:
as_object()
{
- set_member("trace", as_value(as_global_trace));
- set_member("Sound", as_value(sound_new));
- set_member("TextFormat", as_value(textformat_new));
- set_member("XML", as_value(xml_new));
- set_member("XMLNode", as_value(xmlnode_new));
- set_member("XMLSocket", as_value(xmlsocket_new));
+ //-------------------------------------------------
+ // Unclassified - TODO: move to appropriate section
+ //-------------------------------------------------
- // This next set are all the unimplemented classes whose
- // code was machine generated.
- set_member("Date", as_value(date_new));
- set_member("LocalConnection", as_value(localconnection_new));
- set_member("NetConnection", as_value(netconnection_new));
- set_member("NetStream", as_value(netstream_new));
- set_member("System", as_value(system_new));
+ set_member("System", as_value(system_new)); // isn't this a duplicate
of system_class_init ?
// ASSetPropFlags
set_member("ASSetPropFlags", as_global_assetpropflags);
// unescape
@@ -432,28 +424,75 @@
movieclip_class_init(*this);
textsnapshot_class_init(*this);
- video_class_init(*this);
stage_class_init(*this);
sharedobject_class_init(*this);
- selection_class_init(*this);
mouse_class_init(*this);
- microphone_class_init(*this);
loadvars_class_init(*this);
error_class_init(*this);
customactions_class_init(*this);
contextmenu_class_init(*this);
- color_class_init(*this);
- camera_class_init(*this);
- boolean_class_init(*this);
moviecliploader_class_init(*this);
object_class_init(*this);
number_class_init(*this);
string_class_init(*this);
array_class_init(*this);
function_class_init(*this);
+
+ if ( vm.getSWFVersion() < 4 ) goto extscan;
+ //-----------------------
+ // SWF4
+ //-----------------------
+
+ set_member("trace", as_value(as_global_trace));
+ // The methods of the Math class are available
+ // as global methods in SWF4 and as members of
+ // the Math class from SWF5 up
math_class_init(*this);
- key_class_init(*this);
- system_class_init(*this);
+
+ if ( vm.getSWFVersion() < 5 ) goto extscan;
+ //-----------------------
+ // SWF5
+ //-----------------------
+
+ boolean_class_init(*this);
+ color_class_init(*this);
+ selection_class_init(*this); // Selection
+ set_member("Sound", as_value(sound_new));
+ set_member("XML", as_value(xml_new));
+ set_member("XMLNode", as_value(xmlnode_new));
+ set_member("XMLSocket", as_value(xmlsocket_new));
+ set_member("Date", as_value(date_new));
+
+ if ( vm.getSWFVersion() < 6 ) goto extscan;
+ //-----------------------
+ // SWF6
+ //-----------------------
+
+ set_member("LocalConnection", as_value(localconnection_new));
+ set_member("TextFormat", as_value(textformat_new));
+ system_class_init(*this); // System and System.capabilities
+ key_class_init(*this); // Key
+ video_class_init(*this); // Video
+ camera_class_init(*this); // Camera
+ microphone_class_init(*this); // Microphone
+
+ if ( vm.getSWFVersion() < 7 ) goto extscan;
+ //-----------------------
+ // SWF7
+ //-----------------------
+
+ set_member("NetConnection", as_value(netconnection_new));
+ set_member("NetStream", as_value(netstream_new));
+
+ if ( vm.getSWFVersion() < 8 ) goto extscan;
+ //-----------------------
+ // SWF8
+ //-----------------------
+
+ //-----------------------
+ // Extensions
+ //-----------------------
+extscan:
// Scan the plugin directories for all plugins, and load them now.
// FIXME: this should actually be done dynamically, and only
@@ -462,6 +501,8 @@
#ifdef USE_EXTENSIONS
// et.scanDir("/usr/local/lib/gnash/plugins");
et.scanAndLoad(*this);
+#else
+ return;
#endif
}
Index: testsuite/actionscript.all/Camera.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Camera.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/actionscript.all/Camera.as 23 Nov 2006 14:58:54 -0000
1.8
+++ testsuite/actionscript.all/Camera.as 10 Jan 2007 00:09:56 -0000
1.9
@@ -20,10 +20,16 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: Camera.as,v 1.8 2006/11/23 14:58:54 strk Exp $";
+rcsid="$Id: Camera.as,v 1.9 2007/01/10 00:09:56 strk Exp $";
#include "check.as"
+#if OUTPUT_VERSION < 6
+
+check_equals(Camera, undefined);
+
+#else // OUTPUT_VERSION >= 6
+
//trace("NOTE: System.capabilities.hasVideoEncoder: " +
System.capabilities.hasVideoEncoder);
// test the Camera constuctor
@@ -57,3 +63,5 @@
xcheck_equals (cameraObj.setmotionlevel, undefined);
xcheck_equals (cameraObj.setquality, undefined);
#endif
+
+#endif // OUTPUT_VERSION >= 6
Index: testsuite/actionscript.all/LocalConnection.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/LocalConnection.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/actionscript.all/LocalConnection.as 16 Nov 2006 23:26:53
-0000 1.8
+++ testsuite/actionscript.all/LocalConnection.as 10 Jan 2007 00:09:56
-0000 1.9
@@ -22,10 +22,16 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: LocalConnection.as,v 1.8 2006/11/16 23:26:53 strk Exp $";
+rcsid="$Id: LocalConnection.as,v 1.9 2007/01/10 00:09:56 strk Exp $";
#include "dejagnu.as"
+#if OUTPUT_VERSION < 6
+
+check_equals(LocalConnection, undefined);
+
+#else // OUTPUT_VERSION >= 6
+
var tmp = new LocalConnection;
// test the LocalConnection constuctor
@@ -95,4 +101,6 @@
fail("LocalConnection::close()");
}
+#endif // OUTPUT_VERSION >= 6
+
totals();
Index: testsuite/actionscript.all/NetConnection.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/NetConnection.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/NetConnection.as 29 Oct 2006 18:34:18 -0000
1.6
+++ testsuite/actionscript.all/NetConnection.as 10 Jan 2007 00:09:56 -0000
1.7
@@ -22,6 +22,12 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
+#if OUTPUT_VERSION < 7
+
+check_equals(NetConnection, undefined);
+
+#else // OUTPUT_VERSION >= 7
+
var tmp = new NetConnection;
@@ -63,3 +69,5 @@
} else {
xfail("NetConnection::connect() didn't initialized correctly");
}
+
+#endif // OUTPUT_VERSION >= 7
Index: testsuite/actionscript.all/NetStream.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/NetStream.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/NetStream.as 5 Nov 2006 00:45:27 -0000
1.6
+++ testsuite/actionscript.all/NetStream.as 10 Jan 2007 00:09:56 -0000
1.7
@@ -20,10 +20,16 @@
// 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.6 2006/11/05 00:45:27 rsavoye Exp $";
+rcsid="$Id: NetStream.as,v 1.7 2007/01/10 00:09:56 strk Exp $";
#include "check.as"
+#if OUTPUT_VERSION < 7
+
+check_equals(NetStream, undefined);
+
+#else // OUTPUT_VERSION >= 7
+
var netstreamObj = new NetStream;
// test the NetStream constuctor
@@ -39,3 +45,5 @@
check (netstreamObj.seek != undefined);
// test the NetStream::setbuffertime method
check (netstreamObj.setbuffertime != undefined);
+
+#endif // OUTPUT_VERSION >= 7
Index: testsuite/actionscript.all/System.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/System.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/actionscript.all/System.as 5 Nov 2006 00:45:27 -0000
1.7
+++ testsuite/actionscript.all/System.as 10 Jan 2007 00:09:56 -0000
1.8
@@ -20,10 +20,16 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: System.as,v 1.7 2006/11/05 00:45:27 rsavoye Exp $";
+rcsid="$Id: System.as,v 1.8 2007/01/10 00:09:56 strk Exp $";
#include "check.as"
+#if OUTPUT_VERSION < 6
+
+check_equals(NetStream, undefined);
+
+#else // OUTPUT_VERSION >= 6
+
// test the System constuctor (should fail, it's not instantiatable)
var systemObj = new System;
check (systemObj == undefined);
@@ -42,3 +48,5 @@
// test the System.showsettings method
check (System.showsettings != undefined);
+
+#endif // OUTPUT_VERSION >= 6
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/extension.cpp libbase/s...,
Sandro Santilli <=