[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/09 15:01:00

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp textformat.cpp 
                         video_stream_instance.cpp 

Log message:
                * server/: sprite_instance.cpp, textformat.cpp,
                  video_stream_instance.cpp: Use builtin_function for
                  function as_values.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2590&r2=1.2591
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.192&r2=1.193
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2590
retrieving revision 1.2591
diff -u -b -r1.2590 -r1.2591
--- ChangeLog   9 Mar 2007 14:38:28 -0000       1.2590
+++ ChangeLog   9 Mar 2007 15:00:59 -0000       1.2591
@@ -1,3 +1,9 @@
+2007-03-09 Sandro Santilli <address@hidden>
+
+       * server/: sprite_instance.cpp, textformat.cpp,
+         video_stream_instance.cpp: Use builtin_function for
+         function as_values.
+
 2007-03-09 Tomas Groth Christensen <address@hidden>
 
        * libbase/LoadThread.{h,cpp}: Added implementation of a download thread.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- server/sprite_instance.cpp  9 Mar 2007 10:18:49 -0000       1.192
+++ server/sprite_instance.cpp  9 Mar 2007 15:00:59 -0000       1.193
@@ -1222,45 +1222,45 @@
        boost::intrusive_ptr<builtin_function> gettersetter;
 
        // SWF5 or higher
-       o.init_member("attachMovie", &sprite_attach_movie);
-       o.init_member("play", &sprite_play);
-       o.init_member("stop", &sprite_stop);
-       o.init_member("gotoAndStop", &sprite_goto_and_stop);
-       o.init_member("gotoAndPlay", &sprite_goto_and_play);
-       o.init_member("nextFrame", &sprite_next_frame);
-       o.init_member("prevFrame", &sprite_prev_frame);
-       o.init_member("getBytesLoaded", &sprite_get_bytes_loaded);
-       o.init_member("getBytesTotal", &sprite_get_bytes_total);
-       o.init_member("loadMovie", &sprite_load_movie);
-       o.init_member("unloadMovie", &sprite_unload_movie);
-       o.init_member("hitTest", &sprite_hit_test);
-       o.init_member("duplicateMovieClip", &sprite_duplicate_movieclip);
-       o.init_member("swapDepths", &sprite_swap_depths);
-       o.init_member("removeMovieClip", &sprite_remove_movieclip);
-       o.init_member("startDrag", &sprite_startDrag);
-       o.init_member("stopDrag", &sprite_stopDrag);
-       o.init_member("getURL", &sprite_getURL);
-       o.init_member("getBounds", &sprite_getBounds);
-       o.init_member("globalToLocal", &sprite_globalToLocal);
+       o.init_member("attachMovie", new builtin_function(sprite_attach_movie));
+       o.init_member("play", new builtin_function(sprite_play));
+       o.init_member("stop", new builtin_function(sprite_stop));
+       o.init_member("gotoAndStop", new 
builtin_function(sprite_goto_and_stop));
+       o.init_member("gotoAndPlay", new 
builtin_function(sprite_goto_and_play));
+       o.init_member("nextFrame", new builtin_function(sprite_next_frame));
+       o.init_member("prevFrame", new builtin_function(sprite_prev_frame));
+       o.init_member("getBytesLoaded", new 
builtin_function(sprite_get_bytes_loaded));
+       o.init_member("getBytesTotal", new 
builtin_function(sprite_get_bytes_total));
+       o.init_member("loadMovie", new builtin_function(sprite_load_movie));
+       o.init_member("unloadMovie", new builtin_function(sprite_unload_movie));
+       o.init_member("hitTest", new builtin_function(sprite_hit_test));
+       o.init_member("duplicateMovieClip", new 
builtin_function(sprite_duplicate_movieclip));
+       o.init_member("swapDepths", new builtin_function(sprite_swap_depths));
+       o.init_member("removeMovieClip", new 
builtin_function(sprite_remove_movieclip));
+       o.init_member("startDrag", new builtin_function(sprite_startDrag));
+       o.init_member("stopDrag", new builtin_function(sprite_stopDrag));
+       o.init_member("getURL", new builtin_function(sprite_getURL));
+       o.init_member("getBounds", new builtin_function(sprite_getBounds));
+       o.init_member("globalToLocal", new 
builtin_function(sprite_globalToLocal));
        if ( target_version  < 6 ) return;
 
        // SWF6 or higher
-       o.init_member("beginFill", &sprite_beginFill);
-       o.init_member("beginGradientFill", &sprite_beginGradientFill);
-       o.init_member("clear", &sprite_clear);
-       o.init_member("curveTo", &sprite_curveTo);
-       o.init_member("lineStyle", &sprite_lineStyle);
-       o.init_member("lineTo", &sprite_lineTo);
-       o.init_member("moveTo", &sprite_moveTo);
-       o.init_member("endFill", &sprite_endFill);
-       o.init_member("attachAudio", &sprite_attach_audio);
-       o.init_member("createTextField", &sprite_create_text_field);
-       o.init_member("getDepth", &sprite_get_depth);
-       o.init_member("createEmptyMovieClip", &sprite_create_empty_movieclip);
+       o.init_member("beginFill", new builtin_function(sprite_beginFill));
+       o.init_member("beginGradientFill", new 
builtin_function(sprite_beginGradientFill));
+       o.init_member("clear", new builtin_function(sprite_clear));
+       o.init_member("curveTo", new builtin_function(sprite_curveTo));
+       o.init_member("lineStyle", new builtin_function(sprite_lineStyle));
+       o.init_member("lineTo", new builtin_function(sprite_lineTo));
+       o.init_member("moveTo", new builtin_function(sprite_moveTo));
+       o.init_member("endFill", new builtin_function(sprite_endFill));
+       o.init_member("attachAudio", new builtin_function(sprite_attach_audio));
+       o.init_member("createTextField", new 
builtin_function(sprite_create_text_field));
+       o.init_member("getDepth", new builtin_function(sprite_get_depth));
+       o.init_member("createEmptyMovieClip", new 
builtin_function(sprite_create_empty_movieclip));
        if ( target_version  < 7 ) return;
 
        // SWF7 or higher
-       o.init_member("getNextHighestDepth", &sprite_getNextHighestDepth);
+       o.init_member("getNextHighestDepth", new 
builtin_function(sprite_getNextHighestDepth));
        if ( target_version  < 8 ) return;
 
        // TODO: many more methods, see MovieClip class ...
@@ -1373,7 +1373,7 @@
        {
                proto = new as_object();
                attachMovieClipInterface(*proto);
-               proto->init_member("constructor", &movieclip_ctor); 
+               proto->init_member("constructor", new 
builtin_function(movieclip_ctor));
        }
        return proto.get();
 }

Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/textformat.cpp       3 Nov 2006 14:03:37 -0000       1.16
+++ server/textformat.cpp       9 Mar 2007 15:00:59 -0000       1.17
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "log.h"
 #include "textformat.h"
 #include "fn_call.h"
+#include "builtin_function.h" // for getter/setter properties
 
 namespace gnash {  
 
@@ -126,7 +127,7 @@
   //
   // TODO we should handle setTextFormat as a method on TextField,
   // instead of doing this.
-  fn.env->set_variable("setTextFormat", &textformat_setformat);
+  fn.env->set_variable("setTextFormat", new 
builtin_function(textformat_setformat));
   
   fn.result->set_as_object(text_obj);
 }

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/video_stream_instance.cpp    1 Mar 2007 09:50:59 -0000       1.13
+++ server/video_stream_instance.cpp    9 Mar 2007 15:00:59 -0000       1.14
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_instance.cpp,v 1.13 2007/03/01 09:50:59 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.14 2007/03/09 15:00:59 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -25,6 +25,7 @@
 #include "NetStream.h"
 #include "render.h"
 #include "Range2d.h"
+#include "builtin_function.h" // for getter/setter properties
 
 namespace gnash {
 
@@ -60,7 +61,7 @@
 {
        assert(m_def);
        // FIXME: use new layout
-       init_member("attachVideo", &attach_video);
+       init_member("attachVideo", new builtin_function(attach_video));
        m_decoder = m_def->get_decoder();
 }